working on site

A lot of changes - should have been committing more