Committing some changes prior to implementing JSON utility functions.