Marking save point to go back if redesign fails. Redesign moves code to a more Object Oriented set uo.