Continue work on #99

Completed the map reduce portion of #99