Adding comments to remind me what I still have to do
finalizing changes to work with json fold data