Changed the format of the data, but haven't completed my changes to work with it.