Start refactoring to a site, rather than a rest api