Fix/acm schedule refactor

I'm not sure if this gets around the initialization issues.