Completed manager stuff, pending refinement
Revert "Completed manager stuff, pending refinement"

This reverts commit 916b251b92c1f46974b2ce0f2ed93c4bfbedead9.