Add agent_manager
Intermediate commit
Fix conflicts