Reworked stuff, I think its a little cleaner.