Added a header file for the JSON stuff and started to migrate to using the data structures.