added maps, missing gps integration