Added some parsing for the data

More of a coding catch-up for me...