No longer uses json encoding, just a straight-up dict