Added more events for the map -- I think this format will have to change.