Initial overhaul of site.js (DOESN'T WORK YET)