Json work

Merge json work into master