Well, I'm getting closer! My "other" layout is up and running so Tom and his TARDIS are in their proper home now:
And Independence Hall has moved back to Plasticville after 6 years of Disneyland service:
But more importantly, there's a naked tree in our living room with an enormous amount of empty real estate (well, carpet) around it just waiting for me to fill it up!