added the map and the event framework
conflict resolved