Committed initial working version.  ACMC runs seemingly as normal with basically no testing to verify that.