Huge changes that came up when I tried to set up this site again. A lot of refactoring.