Functionally complete, added ModuleManager config