Finishing off json refactoring
more json changes