Tons of stuff!

I never got round to commiting all this. xD