first time getting JSON objects working
merging changes