Lot's of stuff.

I really should make a habit of commiting more often.