Add in basic models and json files.
Use tested java code for the json stuff (for now).
Merge remote-tracking branch 'origin/master'