map integration

Pulling map integration changes into develop branch