This may need a couple of tweaks when Fraser's initial commit goes in - maybe aid -> id in the Java json code, but should be pretty much correct at this point. This supersedes a previous patch on this. Please review, Ade