Ver 2 of the json

This is version 2 more work still needs to be done and an issue needs to
be resolved with the db team.