WIP - Added persistant server state for agents and runs