Archie's office made me so happy once I figured it out, because it's just so brilliantly done.

That's a really good point about Mary Margaret. I was also thinking it reflects back to when she was living on her own in the forest, and hiding things in her little cave; her apartment feels very cavelike (in a spacious kinda way), and that definitely ties in to the whole idea of her being isolated once again.