Added maps
implemented current location