Urgh

Lots of changes... 1 is mine.