wrapping up year, beginning to go in refactor mode. testing along the
way