got start on conversion to new json data structure