Partial commit; working on agents.