Fixed some of the positioning stuff dealing with flushing routes.  Still have issues with calibration being single point and not across the four points.
Completed refactoring of calibration including persistence.  Have not tested on a real robot arm, but simulator appears to be working.