Doing an overhaul, old code commented out