Lots o' shit. I haven't commited in a while, and I've made some serious changes.