Super-mega-duper-hyper-mega refactor!!!