Refactoring: first-pass complete

Back in business w/ test suite: to-do
1) trivial date fix
2) edge case problem remains unresolved ...