Major Overhaul

Woo, winter break project!