Loadsa changes

The stuff we did the other night