Updated makejson.py to use new data
Got find similar working pretty good