V0.3.0 rc

This code has been duplicated in at least 1 other controller.  Should be common and greatly simplified.