Add a bunch of new untested Py3 code, convert yaml->json
Fix tests