added maps, and marker tracking