Massive rewrite of the control point master code.