pretty much finished site, hurray for version control \o/