Update data mapping and processing.
Merge pull request #139 from mikeubell/NewData

Update data mapping and processing.