WIP: mgt class refactor