Initial work on map annotations