diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index a62752d..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-node_modules/**/*
-.expo/*
-npm-debug.*
-*.jks
-*.p12
-*.key
-*.mobileprovision
diff --git a/components/Map.js b/components/Map.js
new file mode 100644
index 0000000..5aef9e5
--- /dev/null
+++ b/components/Map.js
@@ -0,0 +1,21 @@
+import React from 'react';
+import { Content, Container, Header, Title, Button, Left, Right, Body, Icon, Tab, Tabs, ScrollableTab } from 'native-base';
+import MapView, { Marker, Circle, PROVIDER_GOOGLE } from 'react-native-maps'; // remove PROVIDER_GOOGLE import if not using Google Maps
+
+
+    const Map = (props) =>
+      <Container style={{ maxHeight:"100%"}}>
+        <MapView
+          provider={PROVIDER_GOOGLE} // remove if not using Google Maps
+          style={ {height:"100%"} }
+          region={{
+            latitude: props.latitude,
+            longitude: props.longitude,
+            latitudeDelta: 0.15,
+            longitudeDelta: 0.0121,
+          }}
+        >
+        </MapView>
+      </Container>
+
+export default Map
diff --git a/package-lock.json b/package-lock.json
index a43941e..3002d40 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3109,7 +3109,6 @@
         "qs": "^6.5.0",
         "react-native-branch": "2.2.5",
         "react-native-gesture-handler": "1.0.9",
-        "react-native-maps": "github:expo/react-native-maps#e6f98ff7272e5d0a7fe974a41f28593af2d77bb2",
         "react-native-reanimated": "1.0.0-alpha.10",
         "react-native-screens": "1.0.0-alpha.15",
         "react-native-svg": "8.0.8",
@@ -3117,6 +3116,12 @@
         "serialize-error": "^2.1.0",
         "uuid-js": "^0.7.5",
         "whatwg-fetch": "^2.0.4"
+      },
+      "dependencies": {
+        "react-native-maps": {
+          "version": "github:expo/react-native-maps#e6f98ff7272e5d0a7fe974a41f28593af2d77bb2",
+          "from": "github:expo/react-native-maps#e6f98ff7272e5d0a7fe974a41f28593af2d77bb2"
+        }
       }
     },
     "expo-ads-admob": {
@@ -3718,11 +3723,13 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3735,15 +3742,18 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -3846,7 +3856,8 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -3856,6 +3867,7 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -3868,17 +3880,20 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -3895,6 +3910,7 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -3967,7 +3983,8 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -3977,6 +3994,7 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4082,6 +4100,7 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -7558,8 +7577,9 @@
       }
     },
     "react-native-maps": {
-      "version": "github:expo/react-native-maps#e6f98ff7272e5d0a7fe974a41f28593af2d77bb2",
-      "from": "github:expo/react-native-maps#v0.22.1-exp.0"
+      "version": "0.22.1",
+      "resolved": "https://registry.npmjs.org/react-native-maps/-/react-native-maps-0.22.1.tgz",
+      "integrity": "sha512-JjBpAXjzZY8AW4HTcAZxX+cGk6e6i+J5Vd//DViMUe0bRkKKv92ds1W9rqZ+o9PhUqdP++3DvKv0jrB05icqKA=="
     },
     "react-native-platform-touchable": {
       "version": "1.1.1",
diff --git a/screens/LinksScreen.js b/screens/LinksScreen.js
index bee72a8..c19cd70 100644
--- a/screens/LinksScreen.js
+++ b/screens/LinksScreen.js
@@ -1,8 +1,6 @@
 import React from 'react';
 import { ScrollView, StyleSheet } from 'react-native';
-import { ExpoLinksView } from '@expo/samples';
-import { Content, Container, Header, Title, Button, Left, Right, Body, Icon, Tab, Tabs, ScrollableTab } from 'native-base';
-import MapView, { Marker, Circle, PROVIDER_GOOGLE } from 'react-native-maps'; // remove PROVIDER_GOOGLE import if not using Google Maps
+import Map from './../components/Map.js'
 
 
 export default class LinksScreen extends React.Component {
@@ -10,25 +8,11 @@ export default class LinksScreen extends React.Component {
     header: null,
   }
   render() {
-
-    const MapComponent = () =>
-      <Container style={{ maxHeight:"100%"}}>
-        <MapView
-          provider={PROVIDER_GOOGLE} // remove if not using Google Maps
-          style={ {height:"100%"} }
-          region={{
-            latitude: 37.78825,
-            longitude: -122.4324,
-            latitudeDelta: 0.015,
-            longitudeDelta: 0.0121,
-          }}
-        >
-        </MapView>
-      </Container>
-
     return (
       <ScrollView>
-        <MapComponent/>
+        <Map latitude={37.78825}
+             longitude={-122.4324}
+        />
       </ScrollView>
     );
   }