Merging map with dev

Needs code review.