Lots of changes

Lots and lots and lots