Refactoring and testing complete.  Should essentially be done.