Lots of additions, starting to work on main page