diff --git a/.gitignore b/.gitignore
index d93cfa9..7ef979e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,6 +61,8 @@ build/
 # Custom
 app/src/main/res/values/google_maps_api.xml
 .DS_Store
+app/.DS_Store
+app/src/.DS_Store
 google-services.json
 
 # API keys
diff --git a/app/.DS_Store b/app/.DS_Store
index 4ad6958..0958789 100644
Binary files a/app/.DS_Store and b/app/.DS_Store differ
diff --git a/app/src/.DS_Store b/app/src/.DS_Store
index ad96edf..d661142 100644
Binary files a/app/src/.DS_Store and b/app/src/.DS_Store differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8511b08..dc6048f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,9 +4,9 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -19,8 +19,6 @@
         <activity android:name=".views.RouteCardCompact">
 
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <meta-data
@@ -37,7 +35,7 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.example.ithaca_transit_android_v2.MainActivity" />
         </activity>
-
+        
         <!-- google_maps_key loaded in build.gradle -->
         <meta-data
             android:name="com.google.android.geo.API_KEY"
@@ -45,9 +43,11 @@
 
         <activity android:name=".MainActivity">
             <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/MainActivity.kt b/app/src/main/java/com/example/ithaca_transit_android_v2/MainActivity.kt
index f56c5c6..27cf4e8 100644
--- a/app/src/main/java/com/example/ithaca_transit_android_v2/MainActivity.kt
+++ b/app/src/main/java/com/example/ithaca_transit_android_v2/MainActivity.kt
@@ -45,7 +45,6 @@ class MainActivity : AppCompatActivity(), OnMapReadyCallback {
         mSearchPresenter = SearchPresenter(search_card_holder, this, mSearchAdapter)
 
         searchDisposable = mSearchPresenter.initSearchView()
-        (map_fragment as SupportMapFragment).getMapAsync(this)
 
         // set up search adapter, location_list refers to listview of locations on launch
         // location_list_2 refers to the listview of locations when editing their route options
diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/MapFragment.kt b/app/src/main/java/com/example/ithaca_transit_android_v2/MapFragment.kt
new file mode 100644
index 0000000..926f17a
--- /dev/null
+++ b/app/src/main/java/com/example/ithaca_transit_android_v2/MapFragment.kt
@@ -0,0 +1,60 @@
+package com.example.ithaca_transit_android_v2
+
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.example.ithaca_transit_android_v2.R.id.map_fragment
+import com.google.android.gms.common.GooglePlayServicesRepairableException
+import com.google.android.gms.maps.GoogleMap
+import com.google.android.gms.maps.MapView
+import com.google.android.gms.maps.model.LatLng
+import com.google.android.gms.maps.CameraUpdateFactory
+import com.google.android.gms.maps.OnMapReadyCallback
+
+
+class MapFragment: Fragment() , OnMapReadyCallback{
+    private lateinit var mapView: MapView
+    private lateinit var map: GoogleMap
+
+
+    override fun onCreateView(inflater: LayoutInflater,
+                              container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+
+        var v = inflater.inflate(R.layout.fragment_map, container, false)
+        mapView = v.findViewById(R.id.mapView2)
+        mapView.onCreate(savedInstanceState)
+        mapView.getMapAsync { this }
+        return v
+    }
+
+    override fun onMapReady(googleMap: GoogleMap) {
+        map = googleMap
+        map.uiSettings.isMyLocationButtonEnabled = false
+        map.isMyLocationEnabled = true
+        mapView.onResume()
+    }
+    override fun onResume() {
+        mapView.onResume()
+        super.onResume()
+    }
+
+
+    override fun onPause() {
+        super.onPause()
+        mapView.onPause()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        mapView.onDestroy()
+    }
+
+    override fun onLowMemory() {
+        super.onLowMemory()
+        mapView.onLowMemory()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/NetworkUtils.kt b/app/src/main/java/com/example/ithaca_transit_android_v2/NetworkUtils.kt
index 0a1d4f2..cf99fe6 100644
--- a/app/src/main/java/com/example/ithaca_transit_android_v2/NetworkUtils.kt
+++ b/app/src/main/java/com/example/ithaca_transit_android_v2/NetworkUtils.kt
@@ -5,6 +5,7 @@ import com.example.ithaca_transit_android_v2.models.Coordinate
 import com.example.ithaca_transit_android_v2.models.Location
 import com.example.ithaca_transit_android_v2.models.RouteOptions
 import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonReader
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types.newParameterizedType
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0b73779..07bef24 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,21 +8,21 @@
     android:gravity="bottom"
     tools:context=".MainActivity">
 
+
     <fragment
+        android:name="com.example.ithaca_transit_android_v2.MapFragment"
         android:id="@+id/map_fragment"
-        android:name="com.google.android.gms.maps.SupportMapFragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".MainActivity">
-        <LinearLayout
-            android:clickable="false"
-            android:focusable="false"
-            android:layout_marginTop="0dp"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-            <include layout="@layout/search_main" />
-        </LinearLayout>
+        android:layout_height="match_parent" />
+
+    <LinearLayout
+        android:clickable="false"
+        android:focusable="false"
+        android:layout_marginTop="0dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <include layout="@layout/search_main" />
+    </LinearLayout>
 
-    </fragment>
 </RelativeLayout>
 
diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml
new file mode 100644
index 0000000..4cb41ad
--- /dev/null
+++ b/app/src/main/res/layout/fragment_map.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <com.google.android.gms.maps.MapView
+        android:id="@+id/mapView2"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    </com.google.android.gms.maps.MapView>
+
+
+</LinearLayout>
\ No newline at end of file