Add an intermediary data transform and clean up
Get rid of the extraneous seq of maps by merging them
Implement the result restructuring