More work on ModuleManager...  local actions almost all done now.