- Tour work on the new APIs.
- Fixed some conflicts after merging.
- Changes to map model to work on the new API.