Added stuff, removed stuff.

Let us hope this doesn't break everything