Began work on v2 of site, fully object oriented