Jeez. I had destoryed more things, but fixed them too. I think this should be a good commit...