More stuff done.

Now broken :)