Major overhaul to code started.