Changed to bind to map now

Hopefully this works... can you try pulling the changes I have made into your branch? I've now refactored to bond to each map. Need to add in ability to call method on the map & return all points still.