Back in working shape
Groovy, agents added, tests passed.
agents, metadata, passing db items directly