Lots of changes, v1.7

Getting ready to phase this version of the site our for v2