(Issue 655) Refactoring out of control. Going to scale back