Lots of stuff, slightly less buggered from last time