Refactored map code, got sequence of events working
Merge pull request #47 from dtothefp/last-tweaks

Refactored map code, got sequence of events working