Json parsing woes
Fixed up some bugs
Fixed merge conflicts