I'm taking old code, removing all the gross hacks and making it new code! Yay!