Added lots more stuff!

And more stuff!