Starting refactor of site