Mr #51 slave mgr refactoring

Closes #51