Cleaned up a lot of code, all tests and website are working, ready to wire up the other web pages.