Map runs now.

Cleaned up some goofy spacing.  Removed unnecessary extra class and made it so Map will actually call.