Major Overhaul

putting what I learned in Comp 20 into practice