WIP, json cleanup