Cleaned up some goofy spacing.  Removed unnecessary extra class and made
it so Map will actually call.
Merge pull request #1 from rhewett/map_refactor

Map runs now.