Save point.  Started refactoring some of the code.