Manager implementation checkpoint

Updating some manager implementation detials
Close to a testable state