Fleshed out most of it. Added JSON keys along with delicious javadoc.
Merge github.com:Kegsay/addm