Refactor earlier exploratory code to enable current design, sync problem
& solution namespaces, confirm CofR is working.