[wip] Changing design around a Manager