Feature/site prep

Let's try this again. A bunch of site changes.