I am far enough to get the unit tests running and start going test driven.  Lots of cleanup work to follow