Big Update

Lots of work done over holiday by the pool :)