Built out a lot of pages, tightened up functionality