Milestone.  Refactor is now working.