Test any JSON file to see if it can parse

Also reorg / rename a bunch of methods