First major overhaul
Cleaning up and prepping for major overhaul