adding in current state of site, lots of stuff in progress. Rewriting a site sucks