lots of changes, basically a full working site now