Complete overhaul and restructuring of program