overhaul

Initial commit of my changes tag:initial