Json models

Commit to master