Merging to staging

Initial site, see commit msgs