I really need to refactor the agent/master bits to use concat