Added some map annotations, sorta working