Going to Merge Brent's new mapEvent changes

committing my changes before merging upstream to master