diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 92f6f4c..bac4de7 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,9 +1,12 @@
+# Checklist
+- [ ] I ran `./gradlew test connectedAndroidTest detekt`
+- [ ] I rebased off of `upstream/master`
+- [ ] At least 1 approving review - **@dellisd**, **@GustavoSanMartin**
+
 # Issues
-[issueName](issueURL)
+Closed #
 
 # Summary
 Brief summary of what you committed
 
 # Screenshots
-Column1 | Column2
---- | ---
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 5576ada..21fe067 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,6 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlinx-serialization'
 apply plugin: 'com.squareup.sqldelight'
 apply plugin: "androidx.navigation.safeargs.kotlin"
-apply plugin: "org.jlleitschuh.gradle.ktlint"
 
 apply from: '../core_dependencies.gradle'
 apply from: '../test_dependencies.gradle'
diff --git a/app/src/main/java/ca/llamabagel/transpo/data/SearchRepository.kt b/app/src/main/java/ca/llamabagel/transpo/data/SearchRepository.kt
index 2f871db..268acda 100644
--- a/app/src/main/java/ca/llamabagel/transpo/data/SearchRepository.kt
+++ b/app/src/main/java/ca/llamabagel/transpo/data/SearchRepository.kt
@@ -4,29 +4,76 @@
 
 package ca.llamabagel.transpo.data
 
+import ca.llamabagel.transpo.BuildConfig.MAPBOX_KEY
+import ca.llamabagel.transpo.R
+import ca.llamabagel.transpo.data.OttawaBoundaries.MAX_LAT
+import ca.llamabagel.transpo.data.OttawaBoundaries.MAX_LNG
+import ca.llamabagel.transpo.data.OttawaBoundaries.MIN_LAT
+import ca.llamabagel.transpo.data.OttawaBoundaries.MIN_LNG
 import ca.llamabagel.transpo.data.db.TransitDatabase
+import ca.llamabagel.transpo.di.StringsGen
 import ca.llamabagel.transpo.ui.search.viewholders.SearchResult
+import com.mapbox.api.geocoding.v5.MapboxGeocoding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
-class SearchRepository @Inject constructor(private val database: TransitDatabase) {
-    suspend fun getStops(query: String): List<SearchResult> = withContext(Dispatchers.IO) {
-        val stops = database.stopQueries.getStopsByName("$query*").executeAsList()
-        val routes = database.routeQueries.getRoutes("$query%").executeAsList()
+object OttawaBoundaries {
+    const val MIN_LAT = 45.203039
+    const val MIN_LNG = -76.227729
+    const val MAX_LAT = 45.513359
+    const val MAX_LNG = -75.351405
+}
+
+class SearchRepository @Inject constructor(private val database: TransitDatabase, private val strings: StringsGen) {
+
+    suspend fun getSearchResults(query: String): List<SearchResult> = withContext(Dispatchers.IO) {
+        if (query.isEmpty()) return@withContext emptyList<SearchResult>()
 
         val searchResults = mutableListOf<SearchResult>()
 
-        if (routes.isNotEmpty()) {
-            searchResults.add(SearchResult.CategoryHeader("Routes"))
-            searchResults.addAll(routes.map { SearchResult.RouteItem("Name", it.short_name, it.type.toString()) })
+        getStops(query).takeIf { it.isNotEmpty() }?.let { stops ->
+            searchResults.add(SearchResult.CategoryHeader(strings.get(R.string.search_category_routes)))
+            searchResults.addAll(stops)
         }
 
-        if (stops.isNotEmpty()) {
-            searchResults.add(SearchResult.CategoryHeader("Stops"))
-            searchResults.addAll(stops.map { SearchResult.StopItem(it.name, "• ${it.code}", "No upcoming trips") })
+        getRoutes(query).takeIf { it.isNotEmpty() }?.let { routes ->
+            searchResults.add(SearchResult.CategoryHeader(strings.get(R.string.search_category_routes)))
+            searchResults.addAll(routes)
         }
 
-        searchResults
+        getPlaces(query).takeIf { it.isNotEmpty() }?.let { places ->
+            searchResults.add(SearchResult.CategoryHeader(strings.get(R.string.search_category_places)))
+            searchResults.addAll(places)
+        }
+
+        return@withContext searchResults
+    }
+
+    private suspend fun getStops(query: String): List<SearchResult.StopItem> = withContext(Dispatchers.IO) {
+        database.stopQueries
+            .getStopsByName("$query*")
+            .executeAsList()
+            .map { SearchResult.StopItem(it.name, "• ${it.code}", strings.get(R.string.search_stop_no_trips)) }
+    }
+
+    private suspend fun getRoutes(query: String): List<SearchResult.RouteItem> = withContext(Dispatchers.IO) {
+        database.routeQueries
+            .getRoutes("$query%")
+            .executeAsList()
+            .map { SearchResult.RouteItem("Name", it.short_name, it.type.toString()) } // TODO: update name parameter
+    }
+
+    private suspend fun getPlaces(query: String): List<SearchResult.PlaceItem> = withContext(Dispatchers.IO) {
+        MapboxGeocoding.builder()
+            .accessToken(MAPBOX_KEY)
+            .query(query)
+            .bbox(MIN_LNG, MIN_LAT, MAX_LNG, MAX_LAT)
+            .build()
+            .executeCall()
+            .body()
+            ?.features()
+            ?.map { feature ->  SearchResult.PlaceItem(feature.placeName().orEmpty(), feature.text().orEmpty()) }
+            .orEmpty()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ca/llamabagel/transpo/data/TripsRepository.kt b/app/src/main/java/ca/llamabagel/transpo/data/TripsRepository.kt
index d96f04e..de3ed21 100644
--- a/app/src/main/java/ca/llamabagel/transpo/data/TripsRepository.kt
+++ b/app/src/main/java/ca/llamabagel/transpo/data/TripsRepository.kt
@@ -10,6 +10,7 @@ import ca.llamabagel.transpo.data.db.TransitDatabase
 import ca.llamabagel.transpo.models.trips.ApiResponse
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import java.io.IOException
 import javax.inject.Inject
 
 class TripsRepository @Inject constructor(
@@ -24,7 +25,7 @@ class TripsRepository @Inject constructor(
     suspend fun getTrips(stopCode: String): Result<ApiResponse> = withContext(Dispatchers.IO) {
         try {
             Result.Success(apiService.getTrips(stopCode).await())
-        } catch (e: Exception) {
+        } catch (e: IOException) {
             Result.Error(e)
         }
     }
diff --git a/app/src/main/java/ca/llamabagel/transpo/di/CoreModule.kt b/app/src/main/java/ca/llamabagel/transpo/di/CoreModule.kt
index b9e4c18..8935a9b 100644
--- a/app/src/main/java/ca/llamabagel/transpo/di/CoreModule.kt
+++ b/app/src/main/java/ca/llamabagel/transpo/di/CoreModule.kt
@@ -4,6 +4,8 @@
 
 package ca.llamabagel.transpo.di
 
+import android.content.Context
+import androidx.annotation.StringRes
 import ca.llamabagel.transpo.BuildConfig
 import com.jakewharton.retrofit2.adapter.kotlin.coroutines.CoroutineCallAdapterFactory
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
@@ -39,5 +41,11 @@ class CoreModule {
 
     @Provides
     fun provideOkHttpClient(interceptor: HttpLoggingInterceptor): OkHttpClient =
-            OkHttpClient.Builder().addInterceptor(interceptor).build()
+        OkHttpClient.Builder().addInterceptor(interceptor).build()
+
+    @Provides
+    @Singleton
+    fun provideStringsProvider(context: Context): StringsGen = object : StringsGen {
+        override fun get(@StringRes strResId: Int) = context.getString(strResId)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ca/llamabagel/transpo/di/StringsGen.kt b/app/src/main/java/ca/llamabagel/transpo/di/StringsGen.kt
new file mode 100644
index 0000000..ab1a510
--- /dev/null
+++ b/app/src/main/java/ca/llamabagel/transpo/di/StringsGen.kt
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2019 Derek Ellis. Subject to the MIT license.
+ */
+
+package ca.llamabagel.transpo.di
+
+import androidx.annotation.StringRes
+
+interface StringsGen {
+    fun get(@StringRes strResId: Int): String
+}
\ No newline at end of file
diff --git a/app/src/main/java/ca/llamabagel/transpo/di/TransitDatabaseModule.kt b/app/src/main/java/ca/llamabagel/transpo/di/TransitDatabaseModule.kt
index deebddc..a19b284 100644
--- a/app/src/main/java/ca/llamabagel/transpo/di/TransitDatabaseModule.kt
+++ b/app/src/main/java/ca/llamabagel/transpo/di/TransitDatabaseModule.kt
@@ -21,5 +21,6 @@ class TransitDatabaseModule {
 
     @Provides
     @Singleton
-    fun provideSqlDriver(context: Context): SqlDriver = AndroidSqliteDriver(TransitDatabase.Schema, context, "transit.db")
+    fun provideSqlDriver(context: Context): SqlDriver =
+        AndroidSqliteDriver(TransitDatabase.Schema, context, "transit.db")
 }
\ No newline at end of file
diff --git a/app/src/main/java/ca/llamabagel/transpo/di/TripsModule.kt b/app/src/main/java/ca/llamabagel/transpo/di/TripsModule.kt
index eea321c..bb9512f 100644
--- a/app/src/main/java/ca/llamabagel/transpo/di/TripsModule.kt
+++ b/app/src/main/java/ca/llamabagel/transpo/di/TripsModule.kt
@@ -22,7 +22,11 @@ abstract class TripsModule {
     companion object {
         @Provides
         @JvmStatic
-        fun provideTripsService(adapter: CoroutineCallAdapterFactory, converter: Converter.Factory, okHttpClient: OkHttpClient): TripsService = Retrofit.Builder()
+        fun provideTripsService(
+            adapter: CoroutineCallAdapterFactory,
+            converter: Converter.Factory,
+            okHttpClient: OkHttpClient
+        ): TripsService = Retrofit.Builder()
             .baseUrl(BuildConfig.API_ENDPOINT)
             .client(okHttpClient)
             .addCallAdapterFactory(adapter)
diff --git a/app/src/main/java/ca/llamabagel/transpo/ui/home/HomeFragment.kt b/app/src/main/java/ca/llamabagel/transpo/ui/home/HomeFragment.kt
index c5d0ba5..b714cfa 100644
--- a/app/src/main/java/ca/llamabagel/transpo/ui/home/HomeFragment.kt
+++ b/app/src/main/java/ca/llamabagel/transpo/ui/home/HomeFragment.kt
@@ -50,7 +50,8 @@ class HomeFragment : Fragment() {
             val info = it[0]
 
             val finished = info.state.isFinished
-            requireView().findViewById<ProgressBar>(R.id.progress_bar).visibility = if (finished) View.INVISIBLE else View.VISIBLE
+            requireView().findViewById<ProgressBar>(R.id.progress_bar).visibility =
+                if (finished) View.INVISIBLE else View.VISIBLE
         })
 
         requireView().findViewById<Button>(R.id.open_button).setOnClickListener {
diff --git a/app/src/main/java/ca/llamabagel/transpo/ui/map/MapFragment.kt b/app/src/main/java/ca/llamabagel/transpo/ui/map/MapFragment.kt
index fb5b0f4..8539745 100644
--- a/app/src/main/java/ca/llamabagel/transpo/ui/map/MapFragment.kt
+++ b/app/src/main/java/ca/llamabagel/transpo/ui/map/MapFragment.kt
@@ -90,6 +90,7 @@ class MapFragment : Fragment() {
         view?.findViewById<MapView>(R.id.map_view)?.onLowMemory()
     }
 
+    @Suppress("MagicNumber")
     private fun prepareMap(map: MapboxMap) {
         viewModel.getStops()
         viewModel.stops.observe(this, Observer { stops ->
diff --git a/app/src/main/java/ca/llamabagel/transpo/ui/planner/PlannerViewModel.kt b/app/src/main/java/ca/llamabagel/transpo/ui/planner/PlannerViewModel.kt
index 1dd830e..ae34668 100644
--- a/app/src/main/java/ca/llamabagel/transpo/ui/planner/PlannerViewModel.kt
+++ b/app/src/main/java/ca/llamabagel/transpo/ui/planner/PlannerViewModel.kt
@@ -6,6 +6,4 @@ package ca.llamabagel.transpo.ui.planner
 
 import androidx.lifecycle.ViewModel
 
-class PlannerViewModel : ViewModel() {
-    // TODO: Implement the ViewModel
-}
+class PlannerViewModel : ViewModel() // TODO: Implement the ViewModel
diff --git a/app/src/main/java/ca/llamabagel/transpo/ui/saved/SavedViewModel.kt b/app/src/main/java/ca/llamabagel/transpo/ui/saved/SavedViewModel.kt
index 6879fb3..5466f43 100644
--- a/app/src/main/java/ca/llamabagel/transpo/ui/saved/SavedViewModel.kt
+++ b/app/src/main/java/ca/llamabagel/transpo/ui/saved/SavedViewModel.kt
@@ -6,6 +6,4 @@ package ca.llamabagel.transpo.ui.saved
 
 import androidx.lifecycle.ViewModel
 
-class SavedViewModel : ViewModel() {
-    // TODO: Implement the ViewModel
-}
+class SavedViewModel : ViewModel() // TODO: Implement the ViewModel
diff --git a/app/src/main/java/ca/llamabagel/transpo/ui/search/SearchActivity.kt b/app/src/main/java/ca/llamabagel/transpo/ui/search/SearchActivity.kt
index 130e39d..ef4bfd6 100644
--- a/app/src/main/java/ca/llamabagel/transpo/ui/search/SearchActivity.kt
+++ b/app/src/main/java/ca/llamabagel/transpo/ui/search/SearchActivity.kt
@@ -15,6 +15,8 @@ import androidx.recyclerview.widget.RecyclerView
 import ca.llamabagel.transpo.R
 import ca.llamabagel.transpo.di.injector
 
+private const val KEYBOARD_DELAY_TIME = 200L
+
 class SearchActivity : AppCompatActivity() {
 
     private val viewModel: SearchViewModel by viewModels { injector.searchViewModelFactory() }
@@ -34,7 +36,7 @@ class SearchActivity : AppCompatActivity() {
                 searchBar.postDelayed({
                     val keyboard = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
                     keyboard.showSoftInput(searchBar.findFocus(), 0)
-                }, 200)
+                }, KEYBOARD_DELAY_TIME)
             }
         })
 
diff --git a/app/src/main/java/ca/llamabagel/transpo/ui/search/SearchAdapter.kt b/app/src/main/java/ca/llamabagel/transpo/ui/search/SearchAdapter.kt
index 93adda1..960278e 100644
--- a/app/src/main/java/ca/llamabagel/transpo/ui/search/SearchAdapter.kt
+++ b/app/src/main/java/ca/llamabagel/transpo/ui/search/SearchAdapter.kt
@@ -16,15 +16,18 @@ class SearchAdapter(private val list: List<SearchResult>) : RecyclerView.Adapter
 
         val layoutInflater = LayoutInflater.from(parent.context)
         return when (viewType) {
-            SearchResultType.CATEGORY.id -> SearchCategoryViewHolder(
+            SEARCH_CATEGORY_HEADER_LAYOUT -> SearchCategoryViewHolder(
                 DataBindingUtil.inflate(layoutInflater, SEARCH_CATEGORY_HEADER_LAYOUT, parent, false)
             )
-            SearchResultType.ROUTE.id -> SearchRouteViewHolder(
+            SEARCH_RESULT_ROUTE_LAYOUT -> SearchRouteViewHolder(
                 DataBindingUtil.inflate(layoutInflater, SEARCH_RESULT_ROUTE_LAYOUT, parent, false)
             )
-            SearchResultType.STOP.id -> SearchStopViewHolder(
+            SEARCH_RESULT_STOP_LAYOUT -> SearchStopViewHolder(
                 DataBindingUtil.inflate(layoutInflater, SEARCH_RESULT_STOP_LAYOUT, parent, false)
             )
+            SEARCH_RESULT_PLACE_LAYOUT -> SearchPlaceViewHolder(
+                DataBindingUtil.inflate(layoutInflater, SEARCH_RESULT_PLACE_LAYOUT, parent, false)
+            )
             else -> throw IllegalArgumentException("Unknown search result type")
         }
     }
@@ -36,8 +39,14 @@ class SearchAdapter(private val list: List<SearchResult>) : RecyclerView.Adapter
             is SearchResult.CategoryHeader -> (holder as SearchCategoryViewHolder).bind(item)
             is SearchResult.RouteItem -> (holder as SearchRouteViewHolder).bind(item)
             is SearchResult.StopItem -> (holder as SearchStopViewHolder).bind(item)
+            is SearchResult.PlaceItem -> (holder as SearchPlaceViewHolder).bind(item)
         }
     }
 
-    override fun getItemViewType(position: Int) = list[position].id
+    override fun getItemViewType(position: Int) = when (list[position]) {
+        is SearchResult.CategoryHeader -> SEARCH_CATEGORY_HEADER_LAYOUT
+        is SearchResult.RouteItem -> SEARCH_RESULT_ROUTE_LAYOUT
+        is SearchResult.StopItem -> SEARCH_RESULT_STOP_LAYOUT
+        is SearchResult.PlaceItem -> SEARCH_RESULT_PLACE_LAYOUT
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ca/llamabagel/transpo/ui/search/SearchViewModel.kt b/app/src/main/java/ca/llamabagel/transpo/ui/search/SearchViewModel.kt
index ebf15b2..a645c77 100644
--- a/app/src/main/java/ca/llamabagel/transpo/ui/search/SearchViewModel.kt
+++ b/app/src/main/java/ca/llamabagel/transpo/ui/search/SearchViewModel.kt
@@ -30,6 +30,6 @@ class SearchViewModel @Inject constructor(private val searchRepository: SearchRe
     }
 
     fun fetchSearchResults(query: String) = viewModelScope.launch {
-        _searchResults.value = searchRepository.getStops(query)
+        _searchResults.value = searchRepository.getSearchResults(query)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/ca/llamabagel/transpo/ui/search/viewholders/SearchPlaceViewHolder.kt b/app/src/main/java/ca/llamabagel/transpo/ui/search/viewholders/SearchPlaceViewHolder.kt
new file mode 100644
index 0000000..615f778
--- /dev/null
+++ b/app/src/main/java/ca/llamabagel/transpo/ui/search/viewholders/SearchPlaceViewHolder.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2019 Derek Ellis. Subject to the MIT license.
+ */
+
+package ca.llamabagel.transpo.ui.search.viewholders
+
+import androidx.recyclerview.widget.RecyclerView
+import ca.llamabagel.transpo.R
+import ca.llamabagel.transpo.databinding.SearchPlaceBinding
+
+const val SEARCH_RESULT_PLACE_LAYOUT = R.layout.search_place
+
+class SearchPlaceViewHolder(private val binding: SearchPlaceBinding) : RecyclerView.ViewHolder(binding.root) {
+
+    fun bind(place: SearchResult.PlaceItem) {
+        binding.place = place
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ca/llamabagel/transpo/ui/search/viewholders/SearchResult.kt b/app/src/main/java/ca/llamabagel/transpo/ui/search/viewholders/SearchResult.kt
index de8767c..01895bc 100644
--- a/app/src/main/java/ca/llamabagel/transpo/ui/search/viewholders/SearchResult.kt
+++ b/app/src/main/java/ca/llamabagel/transpo/ui/search/viewholders/SearchResult.kt
@@ -4,30 +4,13 @@
 
 package ca.llamabagel.transpo.ui.search.viewholders
 
-enum class SearchResultType(val id: Int) {
-    CATEGORY(0), ROUTE(1), STOP(2)
-}
-
 sealed class SearchResult {
 
-    abstract val id: Int
+    data class CategoryHeader(val header: String) : SearchResult()
 
-    data class CategoryHeader(
-        val header: String,
-        override val id: Int = SearchResultType.CATEGORY.id
-    ) : SearchResult()
+    data class RouteItem(val name: String, val number: String, val type: String) : SearchResult()
 
-    data class RouteItem(
-        val name: String,
-        val number: String,
-        val type: String,
-        override val id: Int = SearchResultType.ROUTE.id
-    ) : SearchResult()
+    data class StopItem(val name: String, val code: String, val routes: String) : SearchResult()
 
-    data class StopItem(
-        val name: String,
-        val code: String,
-        val routes: String,
-        override val id: Int = SearchResultType.STOP.id
-    ) : SearchResult()
+    data class PlaceItem(val primary: String, val secondary: String) : SearchResult()
 }
\ No newline at end of file
diff --git a/app/src/main/java/ca/llamabagel/transpo/ui/trips/TripsFragment.kt b/app/src/main/java/ca/llamabagel/transpo/ui/trips/TripsFragment.kt
index b6bd043..e307b11 100644
--- a/app/src/main/java/ca/llamabagel/transpo/ui/trips/TripsFragment.kt
+++ b/app/src/main/java/ca/llamabagel/transpo/ui/trips/TripsFragment.kt
@@ -93,6 +93,7 @@ class TripsFragment : Fragment() {
         view?.findViewById<MapView>(R.id.map_view)?.onLowMemory()
     }
 
+    @Suppress("MagicNumber")
     private fun prepareMap(map: MapboxMap) {
         // TODO: Move this into a domain layer or something like damn
         viewModel.viewerData.observe(this, Observer { items ->
diff --git a/app/src/main/res/layout/search_place.xml b/app/src/main/res/layout/search_place.xml
new file mode 100644
index 0000000..51b4509
--- /dev/null
+++ b/app/src/main/res/layout/search_place.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2019 Derek Ellis. Subject to the MIT license.
+  -->
+
+<layout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <variable
+                name="place"
+                type="ca.llamabagel.transpo.ui.search.viewholders.SearchResult.PlaceItem"/>
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/xlarge"
+            android:layout_marginTop="@dimen/small">
+
+        <TextView
+                android:id="@+id/stop_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                android:text="@{place.primary}"
+                android:textSize="18sp"/>
+
+        <TextView
+                android:id="@+id/stop_routes"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/stop_name"
+                android:text="@{place.secondary}"
+                android:layout_marginTop="@dimen/xxxsmall"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0b5538b..9945adf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,11 +6,17 @@
     <string name="app_name">Route 613</string>
 
     <!-- searchable label -->
-    <string name="search_hint">Search…</string>
     <string name="title_dashboard">Module Title</string>
     <string name="title_trips">Module Title</string>
     <string name="title_search">Module Title</string>
 
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
+
+    <!-- search -->
+    <string name="search_hint">Search stops, routes, places…</string>
+    <string name="search_category_stops">Stops</string>
+    <string name="search_category_routes">Routes</string>
+    <string name="search_category_places">Places</string>
+    <string name="search_stop_no_trips">No upcoming trips</string>
 </resources>
diff --git a/build.gradle b/build.gradle
index 39d8fce..8aa7065 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,6 +8,7 @@ buildscript {
         maven {
             url "https://plugins.gradle.org/m2/"
         }
+        mavenCentral()
 
     }
     dependencies {
@@ -16,7 +17,6 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         classpath 'com.squareup.sqldelight:gradle-plugin:1.1.3'
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.1.0-alpha04"
-        classpath "org.jlleitschuh.gradle:ktlint-gradle:8.0.0"
     }
 
     ext.versions = [
@@ -36,6 +36,7 @@ buildscript {
             lifecycle               : '2.1.0-beta01',
             material                : '1.1.0-alpha06',
             mapbox                  : '8.0.0',
+            mapboxJavaSdk           : '4.8.0',
             navigation              : '2.0.0',
             okhttp                  : '3.14.2',
             retrofit                : '2.5.0',
@@ -51,6 +52,10 @@ buildscript {
     ]
 }
 
+plugins {
+    id 'io.gitlab.arturbosch.detekt' version '1.0.0-RC14'
+}
+
 allprojects {
     repositories {
         google()
@@ -58,11 +63,9 @@ allprojects {
         maven { url "https://dl.bintray.com/dellisd/transpo" }
         maven { url "https://kotlin.bintray.com/kotlinx/" }
     }
+    apply from: "$rootDir/detekt.gradle"
 }
 
-
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
-
-apply plugin: "org.jlleitschuh.gradle.ktlint"
+}
\ No newline at end of file
diff --git a/core_dependencies.gradle b/core_dependencies.gradle
index 18ead29..4a723ff 100644
--- a/core_dependencies.gradle
+++ b/core_dependencies.gradle
@@ -32,4 +32,5 @@ dependencies {
     implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"
     implementation "com.squareup.okhttp3:logging-interceptor:${versions.okhttp}"
     implementation "com.mapbox.mapboxsdk:mapbox-android-sdk:${versions.mapbox}"
+    implementation "com.mapbox.mapboxsdk:mapbox-sdk-services:${versions.mapboxJavaSdk}"
 }
\ No newline at end of file
diff --git a/default-detekt-config.yml b/default-detekt-config.yml
new file mode 100644
index 0000000..9701097
--- /dev/null
+++ b/default-detekt-config.yml
@@ -0,0 +1,522 @@
+autoCorrect: true
+
+test-pattern: # Configure exclusions for test sources
+  active: true
+  patterns: # Test file regexes
+    - '.*/test/.*'
+    - '.*/androidTest/.*'
+    - '.*Test.kt'
+    - '.*Spec.kt'
+    - '.*Spek.kt'
+  exclude-rule-sets:
+    - 'comments'
+  exclude-rules:
+    - 'NamingRules'
+    - 'WildcardImport'
+    - 'MagicNumber'
+    - 'MaxLineLength'
+    - 'LateinitUsage'
+    - 'StringLiteralDuplication'
+    - 'SpreadOperator'
+    - 'TooManyFunctions'
+    - 'ForEachOnRange'
+    - 'FunctionMaxLength'
+    - 'TooGenericExceptionCaught'
+    - 'InstanceOfCheckForException'
+
+build:
+  maxIssues: 1
+  weights:
+  # complexity: 2
+  # LongParameterList: 1
+  # style: 1
+  # comments: 1
+
+processors:
+  active: true
+  exclude:
+  # - 'FunctionCountProcessor'
+  # - 'PropertyCountProcessor'
+  # - 'ClassCountProcessor'
+  # - 'PackageCountProcessor'
+  # - 'KtFileCountProcessor'
+
+console-reports:
+  active: true
+  exclude:
+  #  - 'ProjectStatisticsReport'
+  #  - 'ComplexityReport'
+  #  - 'NotificationReport'
+  #  - 'FindingsReport'
+  #  - 'BuildFailureReport'
+
+comments:
+  active: true
+  CommentOverPrivateFunction:
+    active: false
+  CommentOverPrivateProperty:
+    active: false
+  EndOfSentenceFormat:
+    active: false
+    endOfSentenceFormat: ([.?!][ \t\n\r\f<])|([.?!]$)
+  UndocumentedPublicClass:
+    active: false
+    searchInNestedClass: true
+    searchInInnerClass: true
+    searchInInnerObject: true
+    searchInInnerInterface: true
+  UndocumentedPublicFunction:
+    active: false
+
+complexity:
+  active: true
+  ComplexCondition:
+    active: true
+    threshold: 4
+  ComplexInterface:
+    active: false
+    threshold: 10
+    includeStaticDeclarations: false
+  ComplexMethod:
+    active: true
+    threshold: 10
+    ignoreSingleWhenExpression: false
+    ignoreSimpleWhenEntries: false
+  LabeledExpression:
+    active: false
+    ignoredLabels: ""
+  LargeClass:
+    active: true
+    threshold: 600
+  LongMethod:
+    active: true
+    threshold: 60
+  LongParameterList:
+    active: true
+    threshold: 6
+    ignoreDefaultParameters: false
+  MethodOverloading:
+    active: false
+    threshold: 6
+  NestedBlockDepth:
+    active: true
+    threshold: 4
+  StringLiteralDuplication:
+    active: false
+    threshold: 3
+    ignoreAnnotation: true
+    excludeStringsWithLessThan5Characters: true
+    ignoreStringsRegex: '$^'
+  TooManyFunctions:
+    active: true
+    thresholdInFiles: 11
+    thresholdInClasses: 11
+    thresholdInInterfaces: 11
+    thresholdInObjects: 11
+    thresholdInEnums: 11
+    ignoreDeprecated: false
+    ignorePrivate: false
+    ignoreOverridden: false
+
+empty-blocks:
+  active: true
+  EmptyCatchBlock:
+    active: true
+    allowedExceptionNameRegex: "^(_|(ignore|expected).*)"
+  EmptyClassBlock:
+    active: true
+  EmptyDefaultConstructor:
+    active: true
+  EmptyDoWhileBlock:
+    active: true
+  EmptyElseBlock:
+    active: true
+  EmptyFinallyBlock:
+    active: true
+  EmptyForBlock:
+    active: true
+  EmptyFunctionBlock:
+    active: true
+    ignoreOverriddenFunctions: false
+  EmptyIfBlock:
+    active: true
+  EmptyInitBlock:
+    active: true
+  EmptyKtFile:
+    active: true
+  EmptySecondaryConstructor:
+    active: true
+  EmptyWhenBlock:
+    active: true
+  EmptyWhileBlock:
+    active: true
+
+exceptions:
+  active: true
+  ExceptionRaisedInUnexpectedLocation:
+    active: false
+    methodNames: 'toString,hashCode,equals,finalize'
+  InstanceOfCheckForException:
+    active: false
+  NotImplementedDeclaration:
+    active: false
+  PrintStackTrace:
+    active: false
+  RethrowCaughtException:
+    active: false
+  ReturnFromFinally:
+    active: false
+  SwallowedException:
+    active: false
+    ignoredExceptionTypes: 'InterruptedException,NumberFormatException,ParseException,MalformedURLException'
+  ThrowingExceptionFromFinally:
+    active: false
+  ThrowingExceptionInMain:
+    active: false
+  ThrowingExceptionsWithoutMessageOrCause:
+    active: false
+    exceptions: 'IllegalArgumentException,IllegalStateException,IOException'
+  ThrowingNewInstanceOfSameException:
+    active: false
+  TooGenericExceptionCaught:
+    active: true
+    exceptionNames:
+      - ArrayIndexOutOfBoundsException
+      - Error
+      - Exception
+      - IllegalMonitorStateException
+      - NullPointerException
+      - IndexOutOfBoundsException
+      - RuntimeException
+      - Throwable
+    allowedExceptionNameRegex: "^(_|(ignore|expected).*)"
+  TooGenericExceptionThrown:
+    active: true
+    exceptionNames:
+      - Error
+      - Exception
+      - Throwable
+      - RuntimeException
+
+formatting:
+  active: true
+  android: false
+  autoCorrect: true
+  ChainWrapping:
+    active: true
+    autoCorrect: true
+  CommentSpacing:
+    active: true
+    autoCorrect: true
+  Filename:
+    active: true
+  FinalNewline:
+    active: true
+    autoCorrect: true
+  ImportOrdering:
+    active: false
+  Indentation:
+    active: true
+    autoCorrect: true
+    indentSize: 4
+    continuationIndentSize: 4
+  MaximumLineLength:
+    active: true
+    maxLineLength: 120
+  ModifierOrdering:
+    active: true
+    autoCorrect: true
+  NoBlankLineBeforeRbrace:
+    active: true
+    autoCorrect: true
+  NoConsecutiveBlankLines:
+    active: true
+    autoCorrect: true
+  NoEmptyClassBody:
+    active: true
+    autoCorrect: true
+  NoItParamInMultilineLambda:
+    active: false
+  NoLineBreakAfterElse:
+    active: true
+    autoCorrect: true
+  NoLineBreakBeforeAssignment:
+    active: true
+    autoCorrect: true
+  NoMultipleSpaces:
+    active: true
+    autoCorrect: true
+  NoSemicolons:
+    active: true
+    autoCorrect: true
+  NoTrailingSpaces:
+    active: true
+    autoCorrect: true
+  NoUnitReturn:
+    active: true
+    autoCorrect: true
+  NoUnusedImports:
+    active: true
+    autoCorrect: true
+  NoWildcardImports:
+    active: true
+    autoCorrect: true
+  PackageName:
+    active: true
+    autoCorrect: true
+  ParameterListWrapping:
+    active: true
+    autoCorrect: true
+    indentSize: 4
+  SpacingAroundColon:
+    active: true
+    autoCorrect: true
+  SpacingAroundComma:
+    active: true
+    autoCorrect: true
+  SpacingAroundCurly:
+    active: true
+    autoCorrect: true
+  SpacingAroundKeyword:
+    active: true
+    autoCorrect: true
+  SpacingAroundOperators:
+    active: true
+    autoCorrect: true
+  SpacingAroundParens:
+    active: true
+    autoCorrect: true
+  SpacingAroundRangeOperator:
+    active: true
+    autoCorrect: true
+  StringTemplate:
+    active: true
+    autoCorrect: true
+
+naming:
+  active: true
+  ClassNaming:
+    active: true
+    classPattern: '[A-Z$][a-zA-Z0-9$]*'
+  ConstructorParameterNaming:
+    active: true
+    parameterPattern: '[a-z][A-Za-z0-9]*'
+    privateParameterPattern: '[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+  EnumNaming:
+    active: true
+    enumEntryPattern: '^[A-Z][_a-zA-Z0-9]*'
+  ForbiddenClassName:
+    active: false
+    forbiddenName: ''
+  FunctionMaxLength:
+    active: false
+    maximumFunctionNameLength: 30
+  FunctionMinLength:
+    active: false
+    minimumFunctionNameLength: 3
+  FunctionNaming:
+    active: true
+    functionPattern: '^([a-z$][a-zA-Z$0-9]*)|(`.*`)$'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+  FunctionParameterNaming:
+    active: true
+    parameterPattern: '[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+    ignoreOverriddenFunctions: true
+  MatchingDeclarationName:
+    active: true
+  MemberNameEqualsClassName:
+    active: false
+    ignoreOverriddenFunction: true
+  ObjectPropertyNaming:
+    active: true
+    constantPattern: '[A-Za-z][_A-Za-z0-9]*'
+    propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
+    privatePropertyPattern: '(_)?[A-Za-z][_A-Za-z0-9]*'
+  PackageNaming:
+    active: true
+    packagePattern: '^[a-z]+(\.[a-z][A-Za-z0-9]*)*$'
+  TopLevelPropertyNaming:
+    active: true
+    constantPattern: '[A-Z][_A-Z0-9]*'
+    propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
+    privatePropertyPattern: '(_)?[A-Za-z][A-Za-z0-9]*'
+  VariableMaxLength:
+    active: false
+    maximumVariableNameLength: 64
+  VariableMinLength:
+    active: false
+    minimumVariableNameLength: 1
+  VariableNaming:
+    active: true
+    variablePattern: '[a-z][A-Za-z0-9]*'
+    privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+
+performance:
+  active: true
+  ArrayPrimitive:
+    active: false
+  ForEachOnRange:
+    active: true
+  SpreadOperator:
+    active: true
+  UnnecessaryTemporaryInstantiation:
+    active: true
+
+potential-bugs:
+  active: true
+  DuplicateCaseInWhenExpression:
+    active: true
+  EqualsAlwaysReturnsTrueOrFalse:
+    active: false
+  EqualsWithHashCodeExist:
+    active: true
+  ExplicitGarbageCollectionCall:
+    active: true
+  InvalidRange:
+    active: false
+  IteratorHasNextCallsNextMethod:
+    active: false
+  IteratorNotThrowingNoSuchElementException:
+    active: false
+  LateinitUsage:
+    active: false
+    excludeAnnotatedProperties: ""
+    ignoreOnClassesPattern: ""
+  UnconditionalJumpStatementInLoop:
+    active: false
+  UnreachableCode:
+    active: true
+  UnsafeCallOnNullableType:
+    active: false
+  UnsafeCast:
+    active: false
+  UselessPostfixExpression:
+    active: false
+  WrongEqualsTypeParameter:
+    active: false
+
+style:
+  active: true
+  CollapsibleIfStatements:
+    active: false
+  DataClassContainsFunctions:
+    active: false
+    conversionFunctionPrefix: 'to'
+  EqualsNullCall:
+    active: false
+  EqualsOnSignatureLine:
+    active: false
+  ExplicitItLambdaParameter:
+    active: false
+  ExpressionBodySyntax:
+    active: false
+    includeLineWrapping: false
+  ForbiddenComment:
+    active: true
+    values: 'FIXME:,STOPSHIP:'
+  ForbiddenImport:
+    active: false
+    imports: ''
+  ForbiddenVoid:
+    active: false
+  FunctionOnlyReturningConstant:
+    active: false
+    ignoreOverridableFunction: true
+    excludedFunctions: 'describeContents'
+  LoopWithTooManyJumpStatements:
+    active: false
+    maxJumpCount: 1
+  MagicNumber:
+    active: true
+    ignoreNumbers: '-1,0,1,2'
+    ignoreHashCodeFunction: true
+    ignorePropertyDeclaration: false
+    ignoreConstantDeclaration: true
+    ignoreCompanionObjectPropertyDeclaration: true
+    ignoreAnnotation: false
+    ignoreNamedArgument: true
+    ignoreEnums: false
+  MandatoryBracesIfStatements:
+    active: false
+  MaxLineLength:
+    active: true
+    maxLineLength: 120
+    excludePackageStatements: true
+    excludeImportStatements: true
+    excludeCommentStatements: false
+  MayBeConst:
+    active: false
+  ModifierOrder:
+    active: true
+  NestedClassesVisibility:
+    active: false
+  NewLineAtEndOfFile:
+    active: false
+  NoTabs:
+    active: false
+  OptionalAbstractKeyword:
+    active: true
+  OptionalUnit:
+    active: false
+  OptionalWhenBraces:
+    active: false
+  PreferToOverPairSyntax:
+    active: false
+  ProtectedMemberInFinalClass:
+    active: false
+  RedundantVisibilityModifierRule:
+    active: false
+  ReturnCount:
+    active: true
+    max: 2
+    excludedFunctions: "equals"
+    excludeLabeled: false
+    excludeReturnFromLambda: true
+  SafeCast:
+    active: true
+  SerialVersionUIDInSerializableClass:
+    active: false
+  SpacingBetweenPackageAndImports:
+    active: false
+  ThrowsCount:
+    active: true
+    max: 2
+  TrailingWhitespace:
+    active: false
+  UnderscoresInNumericLiterals:
+    active: false
+    acceptableDecimalLength: 5
+  UnnecessaryAbstractClass:
+    active: false
+    excludeAnnotatedClasses: "dagger.Module"
+  UnnecessaryApply:
+    active: false
+  UnnecessaryInheritance:
+    active: false
+  UnnecessaryLet:
+    active: false
+  UnnecessaryParentheses:
+    active: false
+  UntilInsteadOfRangeTo:
+    active: false
+  UnusedImports:
+    active: false
+  UnusedPrivateClass:
+    active: false
+  UnusedPrivateMember:
+    active: false
+    allowedNames: "(_|ignored|expected|serialVersionUID)"
+  UseDataClass:
+    active: false
+    excludeAnnotatedClasses: ""
+  UtilityClassWithPublicConstructor:
+    active: false
+  VarCouldBeVal:
+    active: false
+  WildcardImport:
+    active: false
\ No newline at end of file
diff --git a/detekt.gradle b/detekt.gradle
new file mode 100644
index 0000000..512b10c
--- /dev/null
+++ b/detekt.gradle
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2019 Derek Ellis. Subject to the MIT license.
+ */
+
+apply plugin: 'io.gitlab.arturbosch.detekt'
+
+detekt {
+    config = files("$rootDir/default-detekt-config.yml")
+    filters = ".*build.*,.*/resources/.*,.*/tmp/.*"
+    //Optional baseline, uncomment & run gradle command detektBaseline to exclude existing issues
+    //baseline = file("detekt-baseline.xml")
+}
\ No newline at end of file