Initial push to refactoring. First point of "Recommended work order"  is done, I THINK ?!