Re-organizing agent/worker specs.
Add a todo