Starting to switch the plugin to bind to the map rather tahn each map point