Data format

Updating the code to reflect a (more) finalized output data format.