Added map stuff to our app