Successfully rearchitected. Need to do some comment adjustment now
Made good progress with modifies. Need to merge, not replace
Added a note.