Added all fields, in preparation for final push of concept stage. Also abstracted JSON parsing function