Add coordinates class.
 Update Map class
Merge with latest commit.