adding basic map functionality, and fix organization edit