Map listeners working now.
Preparing to merge