diff --git a/App.js b/App.js
new file mode 100644
index 0000000..85388d5
--- /dev/null
+++ b/App.js
@@ -0,0 +1,66 @@
+import React, { Component } from "react";
+import { render } from "react-dom";
+import { BrowserRouter as Router, Route, Switch } from "react-router-dom";
+import { Home } from "./Home";
+import Map from "./Map";
+import { About } from "./About";
+import { Contact } from "./Contact";
+import { NoMatch } from "./NoMatch";
+import { Layout } from "./Components/Layout";
+import { NavigationBar } from "./Components/NavigationBar";
+import { Jumbotron } from "./Components/Jumbotron";
+
+class App extends Component {
+  /*constructor(props) {
+    super(props);
+    this.state = {
+      lat: 0,
+      lng: 0,
+    };
+  } */
+
+  /* componentDidMount() {
+    if (navigator.geolocation) {
+      navigator.geolocation.getCurrentPosition((position) => {
+        this.setState((prevState) => ({
+          lat: prevState.lat + position.coords.latitude,
+          lng: prevState.lng + position.coords.longitude,
+        }));
+        
+      });
+    }
+  }*/
+
+  render() {
+    return (
+      <React.Fragment>
+        <NavigationBar />
+        <Jumbotron />
+        <Layout>
+          <Router>
+            <Switch>
+              <Route exact path="/" component={Home} />
+              <Route path="/about" component={About} />
+              <Route path="/map">
+                <Map />
+              </Route>
+              <Route path="/contact" component={Contact} />
+              <Route component={NoMatch} />
+            </Switch>
+          </Router>
+        </Layout>
+      </React.Fragment>
+    );
+  }
+}
+// function App() {
+//   return (
+//     <div className="App">
+//       Test
+//     </div>
+//   );
+// }
+
+export default App;
+
+render(<App />, document.getElementById("root"));
diff --git a/Map.js b/Map.js
new file mode 100644
index 0000000..403cdb8
--- /dev/null
+++ b/Map.js
@@ -0,0 +1,64 @@
+import React from "react";
+
+class Map extends React.Component {
+  constructor(props) {
+    super(props);
+    this.googleMapRef = React.createRef();
+  }
+
+  componentDidMount() {
+    this.loadMap();
+  }
+
+  loadMap = () => {
+    if (!window.google) {
+      const GOOGLE_MAP_API_KEY = "AIzaSyBWtGcNoFURPqOGSzdRQq0jTom0eFICaNg";
+      let index = window.document.getElementsByTagName("script")[0]; //selects first script tag
+      const googleMapScript = window.document.createElement("script");
+      googleMapScript.src = `https://maps.googleapis.com/maps/api/js?key=${GOOGLE_MAP_API_KEY}`;
+      //googleMapScript.async = true;
+      googleMapScript.defer = true;
+      index.parentNode.insertBefore(googleMapScript, index);
+      googleMapScript.addEventListener("load", () => {
+        this.googleMap = this.createGoogleMap();
+      });
+    }
+  };
+  componentWillUnmount() {
+    this.loadMap();
+  }
+  createGoogleMap = () => {
+    if (navigator.geolocation) {
+      //get location if permission granted
+      navigator.geolocation.getCurrentPosition((position) => {
+        let lat = position.coords.latitude;
+        let lng = position.coords.longitude;
+        //create map from Google Map
+        const map = new window.google.maps.Map(this.googleMapRef.current, {
+          zoom: 16,
+          center: new window.google.maps.LatLng(lat, lng),
+          disableDefaultUI: true,
+        });
+        //create marker in current position
+        const marker = new window.google.maps.Marker({
+          map: map,
+          position: new window.google.maps.LatLng(lat, lng),
+          title: "You are here!",
+        });
+        marker.setMap(map);
+      });
+    }
+  };
+
+  render() {
+    return (
+      <div
+        id="google-map"
+        ref={this.googleMapRef}
+        style={{ width: "100%", height: "80vh" }}
+      />
+    );
+  }
+}
+
+export default Map;