Revised most of project.  Getting things to work smoother and cleaner now.  Lots of  test coverage.