Super Commit!

I think almost everything is done now.