working on JSON
merge conflicts