refactoring successful enough to move forward.  no major issues.