RFR - Adds selection to map

Ended up switching to Poltergeist to get tests to pass consistently...