Massive refactor of site (not done)