diff --git a/app/build.gradle b/app/build.gradle
index 987789f0a..8672b9e34 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "com.google.android.stardroid"
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 31
         versionCode 1530
         versionName "1.10.0 - RC1"
diff --git a/app/src/main/java/com/google/android/stardroid/ApplicationModule.java b/app/src/main/java/com/google/android/stardroid/ApplicationModule.java
index 8313c53fd..d607f1b9c 100644
--- a/app/src/main/java/com/google/android/stardroid/ApplicationModule.java
+++ b/app/src/main/java/com/google/android/stardroid/ApplicationModule.java
@@ -18,6 +18,7 @@
 import com.google.android.stardroid.control.MagneticDeclinationCalculator;
 import com.google.android.stardroid.control.RealMagneticDeclinationCalculator;
 import com.google.android.stardroid.control.ZeroMagneticDeclinationCalculator;
+import com.google.android.stardroid.layers.CometsLayer;
 import com.google.android.stardroid.layers.EclipticLayer;
 import com.google.android.stardroid.layers.GridLayer;
 import com.google.android.stardroid.layers.HorizonLayer;
@@ -153,6 +154,7 @@ LayerManager provideLayerManager(
     layerManager.addLayer(new ConstellationsLayer(assetManager, resources));
     layerManager.addLayer(new SolarSystemLayer(model, resources, preferences));
     layerManager.addLayer(new MeteorShowerLayer(model, resources));
+    layerManager.addLayer(new CometsLayer(model, resources));
     layerManager.addLayer(new GridLayer(resources, 24, 9));
     layerManager.addLayer(new HorizonLayer(model, resources));
     layerManager.addLayer(new EclipticLayer(resources));
diff --git a/app/src/main/java/com/google/android/stardroid/activities/DynamicStarMapActivity.java b/app/src/main/java/com/google/android/stardroid/activities/DynamicStarMapActivity.java
index f869c0dc0..cf496d4d6 100644
--- a/app/src/main/java/com/google/android/stardroid/activities/DynamicStarMapActivity.java
+++ b/app/src/main/java/com/google/android/stardroid/activities/DynamicStarMapActivity.java
@@ -615,7 +615,7 @@ private void doSearchWithIntent(Intent searchIntent) {
     } else {
       Log.d(TAG, "One result returned.");
       final SearchResult result = results.get(0);
-      activateSearchTarget(result.coords, result.capitalizedName);
+      activateSearchTarget(result.coords(), result.capitalizedName);
     }
   }
 
diff --git a/app/src/main/java/com/google/android/stardroid/activities/dialogs/MultipleSearchResultsDialogFragment.java b/app/src/main/java/com/google/android/stardroid/activities/dialogs/MultipleSearchResultsDialogFragment.java
index d2b5e9484..cbc5718fa 100644
--- a/app/src/main/java/com/google/android/stardroid/activities/dialogs/MultipleSearchResultsDialogFragment.java
+++ b/app/src/main/java/com/google/android/stardroid/activities/dialogs/MultipleSearchResultsDialogFragment.java
@@ -48,7 +48,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
           Log.d(TAG, "Many search results Dialog closed with cancel");
         } else {
           final SearchResult item = multipleSearchResultsAdaptor.getItem(whichButton);
-          parentActivity.activateSearchTarget(item.coords, item.capitalizedName);
+          parentActivity.activateSearchTarget(item.coords(), item.capitalizedName);
         }
         dialog.dismiss();
       }
diff --git a/app/src/main/java/com/google/android/stardroid/activities/dialogs/NoSearchResultsDialogFragment.java b/app/src/main/java/com/google/android/stardroid/activities/dialogs/NoSearchResultsDialogFragment.java
index f8fbc184b..5d343eab8 100644
--- a/app/src/main/java/com/google/android/stardroid/activities/dialogs/NoSearchResultsDialogFragment.java
+++ b/app/src/main/java/com/google/android/stardroid/activities/dialogs/NoSearchResultsDialogFragment.java
@@ -32,7 +32,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
     ((HasComponent<ActivityComponent>) getActivity()).getComponent().inject(this);
 
     return new AlertDialog.Builder(parentActivity)
-        .setTitle(R.string.no_search_title).setMessage(R.string.no_search_results_text)
+        .setTitle(R.string.no_search_title).setMessage(R.string.no_search_results_text2)
         .setNegativeButton(android.R.string.ok, new DialogInterface.OnClickListener() {
           public void onClick(DialogInterface dialog1, int whichButton) {
             Log.d(TAG, "No search results Dialog closed");
diff --git a/app/src/main/java/com/google/android/stardroid/layers/AbstractRenderablesLayer.kt b/app/src/main/java/com/google/android/stardroid/layers/AbstractRenderablesLayer.kt
index a75539880..823f8c1ba 100644
--- a/app/src/main/java/com/google/android/stardroid/layers/AbstractRenderablesLayer.kt
+++ b/app/src/main/java/com/google/android/stardroid/layers/AbstractRenderablesLayer.kt
@@ -50,9 +50,8 @@ abstract class AbstractRenderablesLayer(resources: Resources, private val should
             linePrimitives.addAll(renderables.lines)
             val names = astroRenderable.names
             if (!names.isEmpty()) {
-                val searchLoc = astroRenderable.searchLocation
                 for (name in names) {
-                    searchIndex[name.toLowerCase()] = SearchResult(name, searchLoc)
+                    searchIndex[name.toLowerCase()] = SearchResult(name, astroRenderable)
                     prefixStore.add(name.toLowerCase())
                 }
             }
@@ -105,9 +104,9 @@ abstract class AbstractRenderablesLayer(resources: Resources, private val should
 
     override fun searchByObjectName(name: String): List<SearchResult> {
         Log.d(TAG, "Search planets layer for $name")
-        val matches: MutableList<SearchResult> = ArrayList()
+        val matches = ArrayList<SearchResult>()
         val searchResult = searchIndex[name.toLowerCase()]
-        if (searchResult != null) {
+        if (searchResult != null && searchResult.renderable.isVisible) {
             matches.add(searchResult)
         }
         Log.d(TAG, layerName + " provided " + matches.size + "results for " + name)
@@ -122,6 +121,6 @@ abstract class AbstractRenderablesLayer(resources: Resources, private val should
     }
 
     companion object {
-        private val TAG = MiscUtil.getTag(AbstractRenderablesLayer::class.java)
+        val TAG = MiscUtil.getTag(AbstractRenderablesLayer::class.java)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/google/android/stardroid/layers/CometsLayer.kt b/app/src/main/java/com/google/android/stardroid/layers/CometsLayer.kt
new file mode 100644
index 000000000..529a6bc20
--- /dev/null
+++ b/app/src/main/java/com/google/android/stardroid/layers/CometsLayer.kt
@@ -0,0 +1,325 @@
+// Copyright 2011 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.android.stardroid.layers
+
+import android.content.res.Resources
+import android.os.Build
+import androidx.annotation.RequiresApi
+import com.google.android.stardroid.R
+import com.google.android.stardroid.base.TimeConstants
+import com.google.android.stardroid.control.AstronomerModel
+import com.google.android.stardroid.math.RaDec.Companion.decDegreesFromDMS
+import com.google.android.stardroid.math.RaDec.Companion.raDegreesFromHMS
+import com.google.android.stardroid.math.Vector3
+import com.google.android.stardroid.math.getGeocentricCoords
+import com.google.android.stardroid.renderables.*
+import com.google.android.stardroid.renderer.RendererObjectManager.UpdateType
+import com.google.android.stardroid.util.MiscUtil
+import java.time.LocalDate
+import java.time.LocalTime
+import java.time.ZoneId
+import java.time.ZonedDateTime
+import java.util.*
+import kotlin.math.abs
+
+private const val METEOR_SOURCE_PROVIDER = "source_provider.6"
+
+/**
+ * A [Layer] to show the occasional transient comet.
+ *
+ * @author John Taylor
+ */
+// Some of this might eventually get generalized for other 'interpolatable' objects.
+class CometsLayer(private val model: AstronomerModel, resources: Resources) :
+  AbstractRenderablesLayer(resources, true) {
+  private val comets = ArrayList<Comet>()
+
+  @RequiresApi(Build.VERSION_CODES.O)
+  data class TimeEntry(
+    private val localdate: LocalDate,  // Assumed UTC
+    val raDeg: Float,
+    val decDeg: Float,
+    val mag: Float
+  ) {
+    val date: Date
+
+    init {
+      val zonedDateTime = ZonedDateTime.of(localdate, LocalTime.MIDNIGHT, ZoneId.of("UTC"))
+      date = Date.from(zonedDateTime.toInstant())
+    }
+  }
+
+  /**
+   * Simple linear interpolation.
+   * Nothing fancy - just linear scan so O(N) in the number of entries.
+   */
+  class Interpolator(private val xs: List<Long>, private val ys: List<Float>) {
+    init {
+      if (xs.size != ys.size) throw IllegalArgumentException("Arrays must be of same length")
+      if (xs.size < 2) throw IllegalArgumentException("Must have at least two entries")
+    }
+
+    fun interpolate(x: Long): Float {
+      if (x < xs.first() || x > xs.last()) throw IllegalArgumentException("Input out of bounds")
+      for (i in 0..this.xs.size - 2) {
+        if (x >= xs[i] && x <= xs[i + 1]) {
+          return ((x - xs[i]) * ys[i + 1] + (xs[i + 1] - x) * ys[i]) / (xs[i + 1] - xs[i])
+        }
+      }
+      throw IllegalArgumentException("Ran off the end - this shouldn't happen")
+    }
+  }
+
+  private class Comet(
+    val nameId: Int, private val positions: List<TimeEntry>
+  ) {
+    val start: Date
+    val end: Date
+    val xInterpolator: Interpolator
+    val yInterpolator: Interpolator
+    val zInterpolator: Interpolator
+    val magInterpolator: Interpolator
+
+    fun pos(time: Date): Vector3 {
+      if (time.before(start) || time.after(end)) {
+        // Comet shouldn't be visible, but we'll pin it to the start location.
+        return getGeocentricCoords(positions.first().raDeg, positions.first().decDeg)
+      }
+      return Vector3(
+        xInterpolator.interpolate(time.time),
+        yInterpolator.interpolate(time.time),
+        zInterpolator.interpolate(time.time)
+      ).normalizedCopy()
+    }
+
+    init {
+      if (positions.isEmpty()) throw IllegalStateException("Comet has no positions")
+      start = positions.first().date
+      end = positions.last().date
+      var previous = start
+      // TODO(johntaylor): quick and dirty for now, but do something more kotlin-ey later.
+      // Maybe with sequences. I don't have time right now.
+      val times = mutableListOf<Long>()
+      val xValues = mutableListOf<Float>()
+      val yValues = mutableListOf<Float>()
+      val zValues = mutableListOf<Float>()
+      val mags = mutableListOf<Float>()
+      for (entry in positions) {
+        if (entry.date.before(previous)) throw java.lang.IllegalStateException(
+          "Comet dates not " +
+              "in ascending order"
+        )
+        previous = entry.date
+        times.add(entry.date.time)
+        val geoCentricCoords = getGeocentricCoords(entry.raDeg, entry.decDeg)
+        xValues.add(geoCentricCoords.x)
+        yValues.add(geoCentricCoords.y)
+        zValues.add(geoCentricCoords.z)
+        mags.add(entry.mag)
+      }
+      xInterpolator = Interpolator(times, xValues)
+      yInterpolator = Interpolator(times, yValues)
+      zInterpolator = Interpolator(times, zValues)
+      magInterpolator = Interpolator(times, mags)
+    }
+  }
+
+  private fun initializeComets() {
+    comets.add(
+      Comet(
+        R.string.comet_leonard,
+        listOf(
+          TimeEntry(
+            LocalDate.of(2021, 12, 11),
+            raDegreesFromHMS(16f, 18f, 29f),
+            decDegreesFromDMS(7f, 08f, 17f),
+            8f
+          ),
+          TimeEntry(
+            LocalDate.of(2021, 12, 12),
+            raDegreesFromHMS(16f, 49f, 54f),
+            decDegreesFromDMS(1f, 32f, 35f),
+            8f
+          ),
+          TimeEntry(
+            LocalDate.of(2021, 12, 13),
+            raDegreesFromHMS(17f, 22f, 18f),
+            decDegreesFromDMS(-4f, 18f, 41f),
+            8f
+          ),
+          TimeEntry(
+            LocalDate.of(2021, 12, 14),
+            raDegreesFromHMS(17f, 54f, 23f),
+            decDegreesFromDMS(-9f, 57f, 38f),
+            8f
+          ),
+          TimeEntry(
+            LocalDate.of(2021, 12, 15),
+            raDegreesFromHMS(18f, 24f, 50f),
+            decDegreesFromDMS(-15f, 00f, 35f),
+            8f
+          ),
+          TimeEntry(
+            LocalDate.of(2021, 12, 16),
+            raDegreesFromHMS(18f, 52f, 44f),
+            decDegreesFromDMS(-19f, 15f, 14f),
+            8f
+          ),
+          TimeEntry(
+            LocalDate.of(2021, 12, 17),
+            raDegreesFromHMS(19f, 17f, 35f),
+            decDegreesFromDMS(-22f, 40f, 24f),
+            8f
+          ),
+          TimeEntry(
+            LocalDate.of(2021, 12, 18),
+            raDegreesFromHMS(19f, 39f, 19f),
+            decDegreesFromDMS(-25f, 21f, 51f),
+            8f
+          ),
+          TimeEntry(
+            LocalDate.of(2021, 12, 19),
+            raDegreesFromHMS(19f, 58f, 04f),
+            decDegreesFromDMS(-27f, 27f, 36f),
+            9f
+          ),
+          TimeEntry(
+            LocalDate.of(2021, 12, 20),
+            raDegreesFromHMS(20f, 14f, 07f),
+            decDegreesFromDMS(-29f, 05f, 35f),
+            9f
+          ),
+          TimeEntry(
+            LocalDate.of(2021, 12, 21),
+            raDegreesFromHMS(20f, 27f, 50f),
+            decDegreesFromDMS(-30f, 22f, 22f),
+            9f
+          ),
+          TimeEntry(
+            LocalDate.of(2021, 12, 22),
+            raDegreesFromHMS(20f, 39f, 30f),
+            decDegreesFromDMS(-31f, 23f, 09f),
+            9f
+          ),
+          TimeEntry(
+            LocalDate.of(2021, 12, 23),
+            raDegreesFromHMS(20f, 49f, 29f),
+            decDegreesFromDMS(-32f, 11f, 50f),
+            9.23f
+          ),
+          TimeEntry(
+            LocalDate.of(2021, 12, 24),
+            raDegreesFromHMS(20f, 58f, 00f),
+            decDegreesFromDMS(-32f, 51f, 30f),
+            9.36f
+          ),
+        )
+      )
+    )
+  }
+
+  override fun initializeAstroSources(sources: ArrayList<AstronomicalRenderable>) {
+    for (comet in comets) {
+      sources.add(CometRenderable(model, comet, resources))
+    }
+  }
+
+  override val layerDepthOrder = 80
+
+  // This is the same as the meteor layer.
+  override val preferenceId = METEOR_SOURCE_PROVIDER
+  override val layerName = "Comets"
+  override val layerNameId = R.string.show_comet_layer_pref
+
+  private class CometRenderable(
+    private val model: AstronomerModel,
+    private val comet: Comet,
+    resources: Resources
+  ) : AbstractAstronomicalRenderable() {
+    // TODO(johntaylor): why are we overriding these properties?
+    override val labels = ArrayList<TextPrimitive>()
+    override val images = ArrayList<ImagePrimitive>()
+    private var lastUpdateTimeMs = 0L
+    private val theImage: ImagePrimitive
+    private val label: TextPrimitive
+    private val name = resources.getString(comet.nameId)
+    override val names = ArrayList<String>()
+    private var coords: Vector3
+    override var searchLocation = Vector3.zero()
+      private set
+
+    private fun updateComets() {
+      lastUpdateTimeMs = model.time.time
+      // We will only show the comet between certain times.
+      val now = model.time
+      theImage.setUpVector(UP)
+      if (now.after(comet.start) && now.before(comet.end)) {
+        label.text = name
+        theImage.setImageId(R.drawable.comet)
+        isVisible = true
+        // TODO(johntaylor): wait...are we really updating the image positions by dipping into
+        // the coordinate object we pass in? That's terrible.
+        // Must assign here as a result.
+        coords.assign(comet.pos(now))
+        searchLocation = comet.pos(now)
+      } else {
+        // TODO(johntaylor): we need a better solution than just blanking out the object!
+        label.text = " "
+        theImage.setImageId(R.drawable.blank)
+        isVisible = false
+      }
+    }
+
+    override fun initialize(): Renderable {
+      updateComets()
+      return this
+    }
+
+    override fun update(): EnumSet<UpdateType> {
+      val updateTypes = EnumSet.noneOf(UpdateType::class.java)
+      if (abs(model.time.time - lastUpdateTimeMs) > UPDATE_FREQ_MS) {
+        updateComets()
+        updateTypes.add(UpdateType.UpdateImages)
+        updateTypes.add(UpdateType.Reset)
+      }
+      return updateTypes
+    }
+
+    companion object {
+      private const val LABEL_COLOR = 0xf67e81
+      private val UP = Vector3(0.0f, 1.0f, 0.0f)
+      private const val UPDATE_FREQ_MS = 1L * TimeConstants.MILLISECONDS_PER_HOUR
+      private const val SCALE_FACTOR = 0.03f
+      val TAG = MiscUtil.getTag(CometsLayer::class.java)
+    }
+
+    init {
+      names.add(name)
+      // blank is a 1pxX1px image that should be invisible.
+      // We'd prefer not to show any image except on the shower dates, but there
+      // appears to be a bug in the renderer/layer interface in that Update values are not
+      // respected.  Ditto the label.
+      // TODO(johntaylor): fix the bug and remove this blank image
+      coords = comet.pos(model.time)
+      theImage = ImagePrimitive(coords, resources, R.drawable.blank, UP, SCALE_FACTOR)
+      images.add(theImage)
+      label = TextPrimitive(coords, name, LABEL_COLOR)
+      labels.add(label)
+    }
+  }
+
+  init {
+    initializeComets()
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/google/android/stardroid/layers/MeteorShowerLayer.kt b/app/src/main/java/com/google/android/stardroid/layers/MeteorShowerLayer.kt
index 2676fda40..6702b026e 100644
--- a/app/src/main/java/com/google/android/stardroid/layers/MeteorShowerLayer.kt
+++ b/app/src/main/java/com/google/android/stardroid/layers/MeteorShowerLayer.kt
@@ -37,7 +37,7 @@ class MeteorShowerLayer(private val model: AstronomerModel, resources: Resources
     /**
      * Represents a meteor shower.
      */
-    private class Shower(
+    private data class Shower(
         val nameId: Int, val radiant: Vector3,
         val start: Date, val peak: Date, val end: Date, val peakMeteorsPerHour: Int
     )
@@ -174,6 +174,7 @@ class MeteorShowerLayer(private val model: AstronomerModel, resources: Resources
             theImage.setUpVector(UP)
             // TODO(johntaylor): consider varying the sizes by scaling factor as time progresses.
             if (now.after(shower.start) && now.before(shower.end)) {
+                isVisible = true
                 label.text = name
                 val percentToPeak = if (now.before(shower.peak)) {
                     (now.time - shower.start.time).toDouble() /
@@ -190,6 +191,7 @@ class MeteorShowerLayer(private val model: AstronomerModel, resources: Resources
                     theImage.setImageId(R.drawable.meteor1_screen)
                 }
             } else {
+                isVisible = false
                 label.text = " "
                 theImage.setImageId(R.drawable.blank)
             }
diff --git a/app/src/main/java/com/google/android/stardroid/math/RaDec.kt b/app/src/main/java/com/google/android/stardroid/math/RaDec.kt
index 66987b648..800e72324 100644
--- a/app/src/main/java/com/google/android/stardroid/math/RaDec.kt
+++ b/app/src/main/java/com/google/android/stardroid/math/RaDec.kt
@@ -67,7 +67,7 @@ data class RaDec(
         }
 
         @JvmStatic
-        fun calculateRaDecDist(coords: Vector3): RaDec {
+        fun fromGeocentricCoords(coords: Vector3): RaDec {
             // find the RA and DEC from the rectangular equatorial coords
             val ra = mod2pi(atan2(coords.y, coords.x)) * RADIANS_TO_DEGREES
             val dec =
@@ -76,20 +76,6 @@ data class RaDec(
             return RaDec(ra, dec)
         }
 
-        @JvmStatic
-        fun fromGeocentricCoords(coords: Vector3): RaDec {
-            var raRad = atan2(coords.y, coords.x)
-            if (raRad < 0) raRad += TWO_PI
-            val decRad = atan2(
-                coords.z,
-                sqrt(coords.x * coords.x + coords.y * coords.y)
-            )
-            return RaDec(
-                raRad * RADIANS_TO_DEGREES,
-                decRad * RADIANS_TO_DEGREES
-            )
-        }
-
         @JvmStatic
         fun fromHoursMinutesSeconds(
             raHours: Float, raMinutes: Float, raSeconds: Float,
diff --git a/app/src/main/java/com/google/android/stardroid/renderables/AbstractAstronomicalRenderable.kt b/app/src/main/java/com/google/android/stardroid/renderables/AbstractAstronomicalRenderable.kt
index 0a98a01bd..166ea7875 100644
--- a/app/src/main/java/com/google/android/stardroid/renderables/AbstractAstronomicalRenderable.kt
+++ b/app/src/main/java/com/google/android/stardroid/renderables/AbstractAstronomicalRenderable.kt
@@ -35,10 +35,11 @@ abstract class AbstractAstronomicalRenderable : AstronomicalRenderable {
     /** Implementors of this method must implement [.getSearchLocation].  */
     override val names: List<String>
         get() = emptyList()
-    override val searchLocation: Vector3?
+    override val searchLocation: Vector3
         get() {
             throw UnsupportedOperationException("Should not be called")
         }
+    override var isVisible = true
     override val images: List<ImagePrimitive>
         get() = emptyList()
     override val labels: List<TextPrimitive>
diff --git a/app/src/main/java/com/google/android/stardroid/renderables/AstronomicalRenderable.kt b/app/src/main/java/com/google/android/stardroid/renderables/AstronomicalRenderable.kt
index 9de765e90..147d48512 100644
--- a/app/src/main/java/com/google/android/stardroid/renderables/AstronomicalRenderable.kt
+++ b/app/src/main/java/com/google/android/stardroid/renderables/AstronomicalRenderable.kt
@@ -36,7 +36,13 @@ interface AstronomicalRenderable : Renderable {
      * This is the point to which the user will be directed for a search.
      * @return
      */
-    val searchLocation: Vector3?
+    val searchLocation: Vector3
+
+    /**
+     * True if the object should be visible in search results
+     */
+    var isVisible: Boolean
+
     /**
      * Returns the zoom level to which the user should be taken (in manual mode)
      * to completely see this object when searching.
diff --git a/app/src/main/java/com/google/android/stardroid/renderables/proto/ProtobufAstronomicalRenderable.kt b/app/src/main/java/com/google/android/stardroid/renderables/proto/ProtobufAstronomicalRenderable.kt
index 9e35865e1..464525a3f 100644
--- a/app/src/main/java/com/google/android/stardroid/renderables/proto/ProtobufAstronomicalRenderable.kt
+++ b/app/src/main/java/com/google/android/stardroid/renderables/proto/ProtobufAstronomicalRenderable.kt
@@ -124,7 +124,7 @@ class ProtobufAstronomicalRenderable(
         return names!!
     }
 */
-    override val searchLocation: Vector3?
+    override val searchLocation: Vector3
         get() = getCoords(proto.searchLocation)
 
     override val points: List<PointPrimitive>
diff --git a/app/src/main/java/com/google/android/stardroid/search/PrefixStore.java b/app/src/main/java/com/google/android/stardroid/search/PrefixStore.java
index 3f5b479f4..66548b222 100644
--- a/app/src/main/java/com/google/android/stardroid/search/PrefixStore.java
+++ b/app/src/main/java/com/google/android/stardroid/search/PrefixStore.java
@@ -40,6 +40,9 @@ static private class TrieNode {
 
   private static final Set<String> EMPTY_SET = Collections.unmodifiableSet(new HashSet<String>());
 
+  public void clear() {
+    root = new TrieNode();
+  }
   /**
    * Search for any queries matching this prefix.  Note that the prefix is
    * case-independent.
diff --git a/app/src/main/java/com/google/android/stardroid/search/SearchResult.java b/app/src/main/java/com/google/android/stardroid/search/SearchResult.java
index 4ac06046c..40045f54c 100644
--- a/app/src/main/java/com/google/android/stardroid/search/SearchResult.java
+++ b/app/src/main/java/com/google/android/stardroid/search/SearchResult.java
@@ -15,6 +15,7 @@
 package com.google.android.stardroid.search;
 
 import com.google.android.stardroid.math.Vector3;
+import com.google.android.stardroid.renderables.AstronomicalRenderable;
 
 /**
  * A single search result.
@@ -22,18 +23,23 @@
  * @author John Taylor
  */
 public class SearchResult {
-  /** The coordinates of the object.*/
-  public Vector3 coords;
-  /** The user-presentable name of the object, properly capitalized.*/
+  public AstronomicalRenderable renderable;
+  /**
+   * The user-presentable name of the object, properly capitalized.
+   */
   public String capitalizedName;
 
   /**
    * @param capitalizedName The user-presentable name of the object, properly capitalized.
-   * @param coords The geocentric coordinates of the object.
+   * @param renderable      The searched for object..
    */
-  public SearchResult(String capitalizedName, Vector3 coords) {
+  public SearchResult(String capitalizedName, AstronomicalRenderable renderable) {
     this.capitalizedName = capitalizedName;
-    this.coords = coords;
+    this.renderable = renderable;
+  }
+
+  public Vector3 coords() {
+    return renderable.getSearchLocation();
   }
 
   @Override
diff --git a/app/src/main/java/com/google/android/stardroid/space/SolarSystemObject.kt b/app/src/main/java/com/google/android/stardroid/space/SolarSystemObject.kt
index 83665911c..1d560b630 100644
--- a/app/src/main/java/com/google/android/stardroid/space/SolarSystemObject.kt
+++ b/app/src/main/java/com/google/android/stardroid/space/SolarSystemObject.kt
@@ -5,7 +5,7 @@ import com.google.android.stardroid.ephemeris.SolarSystemBody
 import com.google.android.stardroid.math.*
 import java.util.*
 
-import com.google.android.stardroid.math.RaDec.Companion.calculateRaDecDist
+import com.google.android.stardroid.math.RaDec.Companion.fromGeocentricCoords
 import kotlin.math.cos
 
 import com.google.android.stardroid.math.Vector3
@@ -59,7 +59,7 @@ abstract class SolarSystemObject(protected val solarSystemBody : SolarSystemBody
             val moon: Vector3 = getGeocentricCoords(moonRaDec)
             val sunCoords: Vector3 =
                 heliocentricCoordinatesFromOrbitalElements(SolarSystemBody.Earth.getOrbitalElements(time))
-            val sunRaDec = calculateRaDecDist(sunCoords)
+            val sunRaDec = fromGeocentricCoords(sunCoords)
             val (x, y, z) = getGeocentricCoords(sunRaDec)
             return 180.0f -
                     MathUtils.acos(x * moon.x + y * moon.y + z * moon.z) * RADIANS_TO_DEGREES
@@ -75,6 +75,7 @@ abstract class SolarSystemObject(protected val solarSystemBody : SolarSystemBody
         val earthDistance = planetCoords.distanceFrom(earthCoords)
 
         // Finally, calculate the phase of the body.
+        // TODO(johntaylor): reexamine this.
         return MathUtils.acos(
             (earthDistance * earthDistance +
                     planetCoords.length2 -
diff --git a/app/src/main/java/com/google/android/stardroid/space/SunOrbitingObject.kt b/app/src/main/java/com/google/android/stardroid/space/SunOrbitingObject.kt
index 60489eaa5..819842359 100644
--- a/app/src/main/java/com/google/android/stardroid/space/SunOrbitingObject.kt
+++ b/app/src/main/java/com/google/android/stardroid/space/SunOrbitingObject.kt
@@ -13,10 +13,10 @@ open class SunOrbitingObject(solarSystemBody : SolarSystemBody) : SolarSystemObj
     override fun getRaDec(date: Date): RaDec {
         val earthCoords =
             heliocentricCoordinatesFromOrbitalElements(SolarSystemBody.Earth.getOrbitalElements(date))
-        var myCoords = getMyHeliocentricCoordinates(date)
-        myCoords.minusAssign(earthCoords)
+        val myCoords = getMyHeliocentricCoordinates(date)
+        myCoords -= earthCoords
         val equ = convertToEquatorialCoordinates(myCoords)
-        return RaDec.calculateRaDecDist(equ)
+        return RaDec.fromGeocentricCoords(equ)
     }
 
     protected open fun getMyHeliocentricCoordinates(date: Date) =
diff --git a/app/src/main/res/drawable/comet.png b/app/src/main/res/drawable/comet.png
new file mode 100644
index 000000000..8f866398e
Binary files /dev/null and b/app/src/main/res/drawable/comet.png differ
diff --git a/app/src/main/res/values/celestial_objects.xml b/app/src/main/res/values/celestial_objects.xml
index 40653ecd8..80913a337 100644
--- a/app/src/main/res/values/celestial_objects.xml
+++ b/app/src/main/res/values/celestial_objects.xml
@@ -1,5 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Constellations -->
+    <string name="andromeda" translation_description="Name of the Andromeda constellation">Andromeda</string>
+    <string name="aquarius" translation_description="Name of the Aquarius constellation">Aquarius</string>
+    <string name="aquila" translation_description="Name of the Aquila constellation">Aquila</string>
+    <string name="aries" translation_description="Name of the Aries constellation">Aries</string>
+    <string name="auriga" translation_description="Name of the Auriga constellation">Auriga</string>
+    <string name="bootes" translation_description="Name of the Bootes constellation">Bootes</string>
+    <string name="cancer" translation_description="Name of the Cancer constellation">Cancer</string>
+    <string name="canis_major" translation_description="Name of the Canis Major constellation">Canis Major</string>
+    <string name="capricornus" translation_description="Name of the Capricornus constellation">Capricornus</string>
+    <string name="carina" translation_description="Name of the Carina constellation">Carina</string>
+    <string name="cassiopeia" translation_description="Name of the Cassiopeia constellation">Cassiopeia</string>
+    <string name="centaurus" translation_description="Name of the Centaurus constellation">Centaurus</string>
+    <string name="cetus" translation_description="Name of the Cetus constellation">Cetus</string>
+    <string name="crux" translation_description="Name of the Crux constellation">Crux</string>
+    <string name="cygnus" translation_description="Name of the Cygnus constellation">Cygnus</string>
+    <string name="draco" translation_description="Name of the Draco constellation">Draco</string>
+    <string name="eridanus" translation_description="Name of the Eridanus constellation">Eridanus</string>
+    <string name="gemini" translation_description="Name of the Gemini constellation">Gemini</string>
+    <string name="grus" translation_description="Name of the Grus constellation">Grus</string>
+    <string name="hercules" translation_description="Name of the Hercules constellation">Hercules</string>
+    <string name="hydrus" translation_description="Name of the Hydrus constellation">Hydrus</string>
+    <string name="leo" translation_description="Name of the Leo constellation">Leo</string>
+    <string name="libra" translation_description="Name of the Libra constellation">Libra</string>
+    <string name="lupus" translation_description="Name of the Lupus constellation">Lupus</string>
+    <string name="lyra" translation_description="Name of the Lyra constellation">Lyra</string>
+    <string name="ophiuchus" translation_description="Name of the Ophiuchus constellation">Ophiuchus</string>
+    <string name="orion" translation_description="Name of the Orion constellation">Orion</string>
+    <string name="pavo" translation_description="Name of the Pavo constellation">Pavo</string>
+    <string name="pegasus" translation_description="Name of the Pegasus constellation">Pegasus</string>
+    <string name="perseus" translation_description="Name of the Perseus constellation">Perseus</string>
+    <string name="phoenix" translation_description="Name of the Phoenix constellation">Phoenix</string>
+    <string name="pisces" translation_description="Name of the Pisces constellation">Pisces</string>
+    <string name="piscis_austrinus" translation_description="Name of the Piscis Austrinus constellation">Piscis Austrinus</string>
+    <string name="puppis" translation_description="Name of the Puppis constellation">Puppis</string>
+    <string name="sagittarius" translation_description="Name of the Sagittarius constellation">Sagittarius</string>
+    <string name="scorpius" translation_description="Name of the Scorpius constellation">Scorpius</string>
+    <string name="taurus" translation_description="Name of the Taurus constellation">Taurus</string>
+    <string name="tucana" translation_description="Name of the Tucana constellation">Tucana</string>
+    <string name="ursa_major" translation_description="Name of the Ursa Major constellation">Ursa Major</string>
+    <string name="ursa_minor" translation_description="Name of the Ursa Minor constellation">Ursa Minor</string>
+    <string name="vela" translation_description="Name of the Vela constellation">Vela</string>
+    <string name="virgo" translation_description="Name of the Virgo constellation">Virgo</string>
+    <string name="capricorn" translation_description="Name of the Capricorn constellation">Capricorn</string>
+    <string name="southern_cross" translation_description="Name of the Southern Cross constellation">Southern Cross</string>
+    <string name="scorpio" translation_description="Name of the Scorpio constellation">Scorpio</string>
+    <string name="little_dipper" translation_description="Name of the Little Dipper constellation">Little Dipper</string>
+    <string name="little_bear" translation_description="Name of the Little Bear constellation">Little Bear</string>
+    <string name="big_dipper" translation_description="Name of the Big Dipper constellation">Big Dipper</string>
+    <string name="great_bear" translation_description="Name of the Great Bear constellation">Great Bear</string>
+    <string name="plough" translation_description="Name of the Plough constellation">Plough</string>
     <string name="antlia" translation_description="Name of the Antlia constellation">Antlia</string>
     <string name="apus" translation_description="Name of the Apus constellation">Apus</string>
     <string name="ara" translation_description="Name of the Ara constellation">Ara</string>
@@ -47,4 +98,250 @@
     <string name="triangulum_australe" translation_description="Name of the Triangulum Australe constellation">Triangulum Australe</string>
     <string name="volans" translation_description="Name of the Volans constellation">Volans</string>
     <string name="vulpecula" translation_description="Name of the Vulpecula constellation">Vulpecula</string>
+
+    <!-- Major solar system objects -->
+    <string name="sun">Sun</string>
+    <string name="moon">Moon</string>
+    <string name="mercury">Mercury</string>
+    <string name="venus">Venus</string>
+    <string name="earth">Earth</string>
+    <string name="mars">Mars</string>
+    <string name="jupiter">Jupiter</string>
+    <string name="saturn">Saturn</string>
+    <string name="uranus">Uranus</string>
+    <string name="neptune">Neptune</string>
+    <string name="pluto">Pluto</string>
+
+    <!-- Gallery objects -->
+    <string name="crab_nebula" translation_description="hubble object">Crab Nebula</string>
+    <string name="eagle_nebula" translation_description="hubble object">Eagle Nebula</string>
+    <string name="andromeda_galaxy" translation_description="hubble object">Andromeda Galaxy</string>
+    <string name="orion_nebula" translation_description="hubble object">Orion Nebula</string>
+    <string name="whirlpool_galaxy" translation_description="hubble object">Whirlpool Galaxy</string>
+    <string name="ring_nebula" translation_description="hubble object">Ring Nebula</string>
+    <string name="pinwheel_galaxy" translation_description="hubble object">Pinwheel Galaxy</string>
+    <string name="sombrero_galaxy" translation_description="hubble object">Sombrero Galaxy</string>
+    <string name="hercules_gc" translation_description="hubble object">Hercules Globular Cluster</string>
+    <string name="pleiades" translation_description="hubble object">Pleiades</string>
+    <string name="cats_eye_nebula" translation_description="hubble object">Cat\'s Eye Nebula</string>
+    <string name="omega_centauri" translation_description="hubble object">Omega Centauri Globular Cluster</string>
+    <string name="v838_mon" translation_description="hubble object">V838 Monocerotis</string>
+    <string name="sn1987a" translation_description="hubble object">Supernova 1987a</string>
+    <string name="hubble_deep_field" translation_description="hubble object">Hubble Deep Field</string>
+    <string name="hdf" translation_description="hubble object">Hubble Deep Field</string>
+    <string name="rho_oph" translation_description="hubble object">Rho Ophiuchus</string>
+
+
+    <!-- Stars -->
+    <string name="sirius" translation_description="Name of the Star Sirius">Sirius</string>
+    <string name="canopus" translation_description="Name of the Star Canopus">Canopus</string>
+    <string name="arcturus" translation_description="Name of the Star Arcturus">Arcturus</string>
+    <string name="rigel_kentaurus_a" translation_description="Name of the Star Rigel Kentaurus A">Rigel Kentaurus A</string>
+    <string name="rigil_kentaurus_a" translation_description="Name of the Star Rigil Kentaurus A">Rigil Kentaurus A</string>
+    <string name="vega" translation_description="Name of the Star Vega">Vega</string>
+    <string name="rigel" translation_description="Name of the Star Rigel">Rigel</string>
+    <string name="procyon" translation_description="Name of the Star Procyon">Procyon</string>
+    <string name="betelgeuse" translation_description="Name of the Star Betelgeuse">Betelgeuse</string>
+    <string name="achernar" translation_description="Name of the Star Achernar">Achernar</string>
+    <string name="hadar" translation_description="Name of the Star Hadar">Hadar</string>
+    <string name="capella" translation_description="Name of the Star Capella">Capella</string>
+    <string name="altair" translation_description="Name of the Star Altair">Altair</string>
+    <string name="acrux" translation_description="Name of the Star Acrux">Acrux</string>
+    <string name="aldebaran" translation_description="Name of the Star Aldebaran">Aldebaran</string>
+    <string name="spica" translation_description="Name of the Star Spica">Spica</string>
+    <string name="antares" translation_description="Name of the Star Antares">Antares</string>
+    <string name="pollux" translation_description="Name of the Star Pollux">Pollux</string>
+    <string name="fomalhaut" translation_description="Name of the Star Fomalhaut">Fomalhaut</string>
+    <string name="deneb" translation_description="Name of the Star Deneb">Deneb</string>
+    <string name="regulus" translation_description="Name of the Star Regulus">Regulus</string>
+    <string name="adhara" translation_description="Name of the Star Adhara">Adhara</string>
+    <string name="shaula" translation_description="Name of the Star Shaula">Shaula</string>
+    <string name="alnath" translation_description="Name of the Star Alnath">Alnath</string>
+    <string name="alnilam" translation_description="Name of the Star Alnilam">Alnilam</string>
+    <string name="alnair" translation_description="Name of the Star Alnair">Alnair</string>
+    <string name="alioth" translation_description="Name of the Star Alioth">Alioth</string>
+    <string name="mirphak" translation_description="Name of the Star Mirphak">Mirphak</string>
+    <string name="kaus_australis" translation_description="Name of the Star Kaus Australis">Kaus Australis</string>
+    <string name="dubhe" translation_description="Name of the Star Dubhe">Dubhe</string>
+    <string name="alkaid" translation_description="Name of the Star Alkaid">Alkaid</string>
+    <string name="alhena" translation_description="Name of the Star Alhena">Alhena</string>
+    <string name="castor" translation_description="Name of the Star Castor">Castor</string>
+    <string name="polaris" translation_description="Name of the Star Polaris">Polaris</string>
+    <string name="alphard" translation_description="Name of the Star Alphard">Alphard</string>
+    <string name="hamal" translation_description="Name of the Star Hamal">Hamal</string>
+    <string name="algieba" translation_description="Name of the Star Algieba">Algieba</string>
+    <string name="diphda" translation_description="Name of the Star Diphda">Diphda</string>
+    <string name="nunki" translation_description="Name of the Star Nunki">Nunki</string>
+    <string name="mirach" translation_description="Name of the Star Mirach">Mirach</string>
+    <string name="alpheratz" translation_description="Name of the Star Alpheratz">Alpheratz</string>
+    <string name="saiph" translation_description="Name of the Star Saiph">Saiph</string>
+    <string name="kochab" translation_description="Name of the Star Kochab">Kochab</string>
+    <string name="rasalhague" translation_description="Name of the Star Rasalhague">Rasalhague</string>
+    <string name="algol" translation_description="Name of the Star Algol">Algol</string>
+    <string name="denebola" translation_description="Name of the Star Denebola">Denebola</string>
+    <string name="alphekka" translation_description="Name of the Star Alphekka">Alphekka</string>
+    <string name="etamin" translation_description="Name of the Star Etamin">Etamin</string>
+    <string name="kaus" translation_description="Name of the Star Kaus">Kaus</string>
+    <string name="shedir" translation_description="Name of the Star Shedir">Shedir</string>
+    <string name="caph" translation_description="Name of the Star Caph">Caph</string>
+    <string name="izar" translation_description="Name of the Star Izar">Izar</string>
+    <string name="merak" translation_description="Name of the Star Merak">Merak</string>
+    <string name="enif" translation_description="Name of the Star Enif">Enif</string>
+    <string name="ankaa" translation_description="Name of the Star Ankaa">Ankaa</string>
+    <string name="phad" translation_description="Name of the Star Phad">Phad</string>
+    <string name="alderamin" translation_description="Name of the Star Alderamin">Alderamin</string>
+    <string name="scheat" translation_description="Name of the Star Scheat">Scheat</string>
+    <string name="markab" translation_description="Name of the Star Markab">Markab</string>
+    <string name="menkar" translation_description="Name of the Star Menkar">Menkar</string>
+    <string name="arneb" translation_description="Name of the Star Arneb">Arneb</string>
+    <string name="unukalhai" translation_description="Name of the Star Unukalhai">Unukalhai</string>
+    <string name="algenib" translation_description="Name of the Star Algenib">Algenib</string>
+    <string name="vindemiatrix" translation_description="Name of the Star Vindemiatrix">Vindemiatrix</string>
+    <string name="alcyone" translation_description="Name of the Star Alcyone">Alcyone</string>
+    <string name="dog_star" translation_description="Name of the Dog Star (Sirius)">Dog Star</string>
+    <string name="north_star" translation_description="Name of the North Star">North Star</string>
+    <string name="pole_star" translation_description="Name of the (North) Pole Star">Pole Star</string>
+    <string name="alpha_centauri" translation_description="Name of the star Alpha Centauri">Alpha Centauri</string>
+    <string name="rigil_kent" translation_description="Name of the star Rigil Kent">Rigil Kent</string>
+    <string name="e_lyrae" translation_description="Name of the star ε Lyrae">ε Lyrae</string>
+
+    <!-- Messier objects etc -->
+    <string name="m1" translation_description="Name of the Messier object M1">M1</string>
+    <string name="m2" translation_description="Name of the Messier object M2">M2</string>
+    <string name="m3" translation_description="Name of the Messier object M3">M3</string>
+    <string name="m4" translation_description="Name of the Messier object M4">M4</string>
+    <string name="m5" translation_description="Name of the Messier object M5">M5</string>
+    <string name="m6" translation_description="Name of the Messier object M6">M6</string>
+    <string name="m7" translation_description="Name of the Messier object M7">M7</string>
+    <string name="m8" translation_description="Name of the Messier object M8">M8</string>
+    <string name="m9" translation_description="Name of the Messier object M9">M9</string>
+    <string name="m10" translation_description="Name of the Messier object M10">M10</string>
+    <string name="m11" translation_description="Name of the Messier object M11">M11</string>
+    <string name="m12" translation_description="Name of the Messier object M12">M12</string>
+    <string name="m13" translation_description="Name of the Messier object M13">M13</string>
+    <string name="m14" translation_description="Name of the Messier object M14">M14</string>
+    <string name="m15" translation_description="Name of the Messier object M15">M15</string>
+    <string name="m16" translation_description="Name of the Messier object M16">M16</string>
+    <string name="m17" translation_description="Name of the Messier object M17">M17</string>
+    <string name="m18" translation_description="Name of the Messier object M18">M18</string>
+    <string name="m19" translation_description="Name of the Messier object M19">M19</string>
+    <string name="m20" translation_description="Name of the Messier object M20">M20</string>
+    <string name="m21" translation_description="Name of the Messier object M21">M21</string>
+    <string name="m22" translation_description="Name of the Messier object M22">M22</string>
+    <string name="m23" translation_description="Name of the Messier object M23">M23</string>
+    <string name="m24" translation_description="Name of the Messier object M24">M24</string>
+    <string name="m25" translation_description="Name of the Messier object M25">M25</string>
+    <string name="m26" translation_description="Name of the Messier object M26">M26</string>
+    <string name="m27" translation_description="Name of the Messier object M27">M27</string>
+    <string name="m28" translation_description="Name of the Messier object M28">M28</string>
+    <string name="m29" translation_description="Name of the Messier object M29">M29</string>
+    <string name="m30" translation_description="Name of the Messier object M30">M30</string>
+    <string name="m31" translation_description="Name of the Messier object M31">M31</string>
+    <string name="m32" translation_description="Name of the Messier object M32">M32</string>
+    <string name="m33" translation_description="Name of the Messier object M33">M33</string>
+    <string name="m34" translation_description="Name of the Messier object M34">M34</string>
+    <string name="m35" translation_description="Name of the Messier object M35">M35</string>
+    <string name="m36" translation_description="Name of the Messier object M36">M36</string>
+    <string name="m37" translation_description="Name of the Messier object M37">M37</string>
+    <string name="m38" translation_description="Name of the Messier object M38">M38</string>
+    <string name="m39" translation_description="Name of the Messier object M39">M39</string>
+    <string name="m40" translation_description="Name of the Messier object M40">M40</string>
+    <string name="m41" translation_description="Name of the Messier object M41">M41</string>
+    <string name="m42" translation_description="Name of the Messier object M42">M42</string>
+    <string name="m43" translation_description="Name of the Messier object M43">M43</string>
+    <string name="m44" translation_description="Name of the Messier object M44">M44</string>
+    <string name="m45" translation_description="Name of the Messier object M45">M45</string>
+    <string name="m46" translation_description="Name of the Messier object M46">M46</string>
+    <string name="m47" translation_description="Name of the Messier object M47">M47</string>
+    <string name="m48" translation_description="Name of the Messier object M48">M48</string>
+    <string name="m49" translation_description="Name of the Messier object M49">M49</string>
+    <string name="m50" translation_description="Name of the Messier object M50">M50</string>
+    <string name="m51" translation_description="Name of the Messier object M51">M51</string>
+    <string name="m52" translation_description="Name of the Messier object M52">M52</string>
+    <string name="m53" translation_description="Name of the Messier object M53">M53</string>
+    <string name="m54" translation_description="Name of the Messier object M54">M54</string>
+    <string name="m55" translation_description="Name of the Messier object M55">M55</string>
+    <string name="m56" translation_description="Name of the Messier object M56">M56</string>
+    <string name="m57" translation_description="Name of the Messier object M57">M57</string>
+    <string name="m58" translation_description="Name of the Messier object M58">M58</string>
+    <string name="m59" translation_description="Name of the Messier object M59">M59</string>
+    <string name="m60" translation_description="Name of the Messier object M60">M60</string>
+    <string name="m61" translation_description="Name of the Messier object M61">M61</string>
+    <string name="m62" translation_description="Name of the Messier object M62">M62</string>
+    <string name="m63" translation_description="Name of the Messier object M63">M63</string>
+    <string name="m64" translation_description="Name of the Messier object M64">M64</string>
+    <string name="m65" translation_description="Name of the Messier object M65">M65</string>
+    <string name="m66" translation_description="Name of the Messier object M66">M66</string>
+    <string name="m67" translation_description="Name of the Messier object M67">M67</string>
+    <string name="m68" translation_description="Name of the Messier object M68">M68</string>
+    <string name="m69" translation_description="Name of the Messier object M69">M69</string>
+    <string name="m70" translation_description="Name of the Messier object M70">M70</string>
+    <string name="m71" translation_description="Name of the Messier object M71">M71</string>
+    <string name="m72" translation_description="Name of the Messier object M72">M72</string>
+    <string name="m73" translation_description="Name of the Messier object M73">M73</string>
+    <string name="m74" translation_description="Name of the Messier object M74">M74</string>
+    <string name="m75" translation_description="Name of the Messier object M75">M75</string>
+    <string name="m76" translation_description="Name of the Messier object M76">M76</string>
+    <string name="m77" translation_description="Name of the Messier object M77">M77</string>
+    <string name="m78" translation_description="Name of the Messier object M78">M78</string>
+    <string name="m79" translation_description="Name of the Messier object M79">M79</string>
+    <string name="m80" translation_description="Name of the Messier object M80">M80</string>
+    <string name="m81" translation_description="Name of the Messier object M81">M81</string>
+    <string name="m82" translation_description="Name of the Messier object M82">M82</string>
+    <string name="m83" translation_description="Name of the Messier object M83">M83</string>
+    <string name="m84" translation_description="Name of the Messier object M84">M84</string>
+    <string name="m85" translation_description="Name of the Messier object M85">M85</string>
+    <string name="m86" translation_description="Name of the Messier object M86">M86</string>
+    <string name="m87" translation_description="Name of the Messier object M87">M87</string>
+    <string name="m88" translation_description="Name of the Messier object M88">M88</string>
+    <string name="m89" translation_description="Name of the Messier object M89">M89</string>
+    <string name="m90" translation_description="Name of the Messier object M90">M90</string>
+    <string name="m91" translation_description="Name of the Messier object M91">M91</string>
+    <string name="m92" translation_description="Name of the Messier object M92">M92</string>
+    <string name="m93" translation_description="Name of the Messier object M93">M93</string>
+    <string name="m94" translation_description="Name of the Messier object M94">M94</string>
+    <string name="m95" translation_description="Name of the Messier object M95">M95</string>
+    <string name="m96" translation_description="Name of the Messier object M96">M96</string>
+    <string name="m97" translation_description="Name of the Messier object M97">M97</string>
+    <string name="m98" translation_description="Name of the Messier object M98">M98</string>
+    <string name="m99" translation_description="Name of the Messier object M99">M99</string>
+    <string name="m100" translation_description="Name of the Messier object M100">M100</string>
+    <string name="m101" translation_description="Name of the Messier object M101">M101</string>
+    <string name="m102" translation_description="Name of the Messier object M102">M102</string>
+    <string name="m103" translation_description="Name of the Messier object M103">M103</string>
+    <string name="m104" translation_description="Name of the Messier object M104">M104</string>
+    <string name="m105" translation_description="Name of the Messier object M105">M105</string>
+    <string name="m106" translation_description="Name of the Messier object M106">M106</string>
+    <string name="m107" translation_description="Name of the Messier object M107">M107</string>
+    <string name="m108" translation_description="Name of the Messier object M108">M108</string>
+    <string name="m109" translation_description="Name of the Messier object M109">M109</string>
+    <string name="m110" translation_description="Name of the Messier object M110">M110</string>
+    <string name="ngc6543" translation_description="Name of the Messier object NGC6543">NGC6543</string>
+    <string name="ngc5139" translation_description="Name of the Messier object NGC5139">NGC5139</string>
+    <string name="butterfly_cluster" translation_description="Name of the Messier object Butterfly Cluster">Butterfly Cluster</string>
+    <string name="scorpions_tail" translation_description="Name of the Messier object Scorpion\'s Tail">Scorpion\'s Tail</string>
+    <string name="winnecke_4" translation_description="Name of the Messier object Winnecke 4">Winnecke 4</string>
+    <string name="beehive_cluster" translation_description="Name of the Messier object Beehive Cluster">Beehive Cluster</string>
+    <string name="praesepe" translation_description="Name of the Messier object Praesepe">Praesepe</string>
+    <string name="seven_sisters" translation_description="Name of the Messier object Seven Sisters">Seven Sisters</string>
+
+    <!-- Manmade objects -->
+    <string name="space_station" translation_description="Name of the Internation Space Station">International Space Station</string>
+    <string name="space_shuttle" translation_description="Name of the Space Shuttle">Space Shuttle</string>
+
+    <!-- Meteors -->
+    <string name="leonids" translation_description="Meteor Shower">Leonids</string>
+    <string name="geminids" translation_description="Meteor Shower">Geminids</string>
+    <string name="quadrantids" translation_description="Meteor Shower">Quadrantids</string>
+    <string name="lyrids" translation_description="Meteor Shower">Lyrids</string>
+    <string name="aquariids" translation_description="Meteor Shower">Eta Aquariids</string>
+    <string name="deltaaquariids" translation_description="Meteor Shower">Delta Aquariids</string>
+    <string name="perseids" translation_description="Meteor Shower">Perseids</string>
+    <string name="orionids" translation_description="Meteor Shower">Orionids</string>
+    <string name="puppidvelids" translation_description="Meteor Shower">Puppid-Velids</string>
+    <string name="ursids" translation_description="Meteor Shower">Ursids</string>
+
+    <!-- Comets -->
+    <string name="comet_leonard">Comet Leonard</string>
+    <string name="comet_neowise">Comet Neowise</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6970902a7..77903a736 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -39,6 +39,7 @@
     <string name="show_horizon_pref">Horizon</string>
     <string name="show_sky_gradient" translation_description="This is a shading of the color of the sky used for effect">Sky Gradient</string>
     <string name="show_meteors_pref">Meteor Showers</string>
+    <string name="show_comet_layer_pref">Comets</string>
     <string name="show_satellite_layer_pref" translation_description="The layer for satellites">Satellites</string>
     <!-- Just in case we decide to have such a layer for the 4/24 launch -->
     <string name="show_hubble_layer_pref">Hubble Images</string>
@@ -68,6 +69,9 @@
     <string name="search_hint" translation_description="an example search target">e.g. Mars</string>
     <string name="no_search_title">No results</string>
     <string name="no_search_results_text">No results were found.</string>
+    <!-- Hopefully this is a temporary measure until we can fix the search engine -->
+    <string name="no_search_results_text2">No results were found. Perhaps the object is not
+        visible at this time.</string>
     <string name="many_search_results_title">Did you mean?</string>
     <string name="many_search_results_text">Please select one</string>
     <string name="searching_for_text">Searching for %s...</string>
@@ -120,34 +124,7 @@
 
     <string name="missing_label" translation_description="Used to indicate to the developer that they've added a resource with no translation.">MISSING_LBL</string>
 
-    <string name="sun">Sun</string>
-    <string name="moon">Moon</string>
-    <string name="mercury">Mercury</string>
-    <string name="venus">Venus</string>
-    <string name="earth">Earth</string>
-    <string name="mars">Mars</string>
-    <string name="jupiter">Jupiter</string>
-    <string name="saturn">Saturn</string>
-    <string name="uranus">Uranus</string>
-    <string name="neptune">Neptune</string>
-    <string name="pluto">Pluto</string>
-    <string name="crab_nebula" translation_description="hubble object">Crab Nebula</string>
-    <string name="eagle_nebula" translation_description="hubble object">Eagle Nebula</string>
-    <string name="andromeda_galaxy" translation_description="hubble object">Andromeda Galaxy</string>
-    <string name="orion_nebula" translation_description="hubble object">Orion Nebula</string>
-    <string name="whirlpool_galaxy" translation_description="hubble object">Whirlpool Galaxy</string>
-    <string name="ring_nebula" translation_description="hubble object">Ring Nebula</string>
-    <string name="pinwheel_galaxy" translation_description="hubble object">Pinwheel Galaxy</string>
-    <string name="sombrero_galaxy" translation_description="hubble object">Sombrero Galaxy</string>
-    <string name="hercules_gc" translation_description="hubble object">Hercules Globular Cluster</string>
-    <string name="pleiades" translation_description="hubble object">Pleiades</string>
-    <string name="cats_eye_nebula" translation_description="hubble object">Cat\'s Eye Nebula</string>
-    <string name="omega_centauri" translation_description="hubble object">Omega Centauri Globular Cluster</string>
-    <string name="v838_mon" translation_description="hubble object">V838 Monocerotis</string>
-    <string name="sn1987a" translation_description="hubble object">Supernova 1987a</string>
-    <string name="hubble_deep_field" translation_description="hubble object">Hubble Deep Field</string>
-    <string name="hdf" translation_description="hubble object">Hubble Deep Field</string>
-    <string name="rho_oph" translation_description="hubble object">Rho Ophiuchus</string>
+
     <string name="menu_tos">Terms of Service</string>
     <string name="menu_diagnostics">Diagnostics</string>
     <!-- TODO(johntaylor): the following might be deleted in favor of an icon -->
@@ -156,264 +133,11 @@
     <string name="north_pole">NP</string>
     <string name="south_pole">SP</string>
 
-    <string name="andromeda" translation_description="Name of the Andromeda constellation">Andromeda</string>
-    <string name="aquarius" translation_description="Name of the Aquarius constellation">Aquarius</string>
-    <string name="aquila" translation_description="Name of the Aquila constellation">Aquila</string>
-    <string name="aries" translation_description="Name of the Aries constellation">Aries</string>
-    <string name="auriga" translation_description="Name of the Auriga constellation">Auriga</string>
-    <string name="bootes" translation_description="Name of the Bootes constellation">Bootes</string>
-    <string name="cancer" translation_description="Name of the Cancer constellation">Cancer</string>
-    <string name="canis_major" translation_description="Name of the Canis Major constellation">Canis Major</string>
-    <string name="capricornus" translation_description="Name of the Capricornus constellation">Capricornus</string>
-    <string name="carina" translation_description="Name of the Carina constellation">Carina</string>
-    <string name="cassiopeia" translation_description="Name of the Cassiopeia constellation">Cassiopeia</string>
-    <string name="centaurus" translation_description="Name of the Centaurus constellation">Centaurus</string>
-    <string name="cetus" translation_description="Name of the Cetus constellation">Cetus</string>
-    <string name="crux" translation_description="Name of the Crux constellation">Crux</string>
-    <string name="cygnus" translation_description="Name of the Cygnus constellation">Cygnus</string>
-    <string name="draco" translation_description="Name of the Draco constellation">Draco</string>
-    <string name="eridanus" translation_description="Name of the Eridanus constellation">Eridanus</string>
-    <string name="gemini" translation_description="Name of the Gemini constellation">Gemini</string>
-    <string name="grus" translation_description="Name of the Grus constellation">Grus</string>
-    <string name="hercules" translation_description="Name of the Hercules constellation">Hercules</string>
-    <string name="hydrus" translation_description="Name of the Hydrus constellation">Hydrus</string>
-    <string name="leo" translation_description="Name of the Leo constellation">Leo</string>
-    <string name="libra" translation_description="Name of the Libra constellation">Libra</string>
-    <string name="lupus" translation_description="Name of the Lupus constellation">Lupus</string>
-    <string name="lyra" translation_description="Name of the Lyra constellation">Lyra</string>
-    <string name="ophiuchus" translation_description="Name of the Ophiuchus constellation">Ophiuchus</string>
-    <string name="orion" translation_description="Name of the Orion constellation">Orion</string>
-    <string name="pavo" translation_description="Name of the Pavo constellation">Pavo</string>
-    <string name="pegasus" translation_description="Name of the Pegasus constellation">Pegasus</string>
-    <string name="perseus" translation_description="Name of the Perseus constellation">Perseus</string>
-    <string name="phoenix" translation_description="Name of the Phoenix constellation">Phoenix</string>
-    <string name="pisces" translation_description="Name of the Pisces constellation">Pisces</string>
-    <string name="piscis_austrinus" translation_description="Name of the Piscis Austrinus constellation">Piscis Austrinus</string>
-    <string name="puppis" translation_description="Name of the Puppis constellation">Puppis</string>
-    <string name="sagittarius" translation_description="Name of the Sagittarius constellation">Sagittarius</string>
-    <string name="scorpius" translation_description="Name of the Scorpius constellation">Scorpius</string>
-    <string name="taurus" translation_description="Name of the Taurus constellation">Taurus</string>
-    <string name="tucana" translation_description="Name of the Tucana constellation">Tucana</string>
-    <string name="ursa_major" translation_description="Name of the Ursa Major constellation">Ursa Major</string>
-    <string name="ursa_minor" translation_description="Name of the Ursa Minor constellation">Ursa Minor</string>
-    <string name="vela" translation_description="Name of the Vela constellation">Vela</string>
-    <string name="virgo" translation_description="Name of the Virgo constellation">Virgo</string>
-    <string name="capricorn" translation_description="Name of the Capricorn constellation">Capricorn</string>
-    <string name="southern_cross" translation_description="Name of the Southern Cross constellation">Southern Cross</string>
-    <string name="scorpio" translation_description="Name of the Scorpio constellation">Scorpio</string>
-    <string name="little_dipper" translation_description="Name of the Little Dipper constellation">Little Dipper</string>
-    <string name="little_bear" translation_description="Name of the Little Bear constellation">Little Bear</string>
-    <string name="big_dipper" translation_description="Name of the Big Dipper constellation">Big Dipper</string>
-    <string name="great_bear" translation_description="Name of the Great Bear constellation">Great Bear</string>
-    <string name="plough" translation_description="Name of the Plough constellation">Plough</string>
-
-    <string name="sirius" translation_description="Name of the Star Sirius">Sirius</string>
-    <string name="canopus" translation_description="Name of the Star Canopus">Canopus</string>
-    <string name="arcturus" translation_description="Name of the Star Arcturus">Arcturus</string>
-    <string name="rigel_kentaurus_a" translation_description="Name of the Star Rigel Kentaurus A">Rigel Kentaurus A</string>
-    <string name="rigil_kentaurus_a" translation_description="Name of the Star Rigil Kentaurus A">Rigil Kentaurus A</string>
-    <string name="vega" translation_description="Name of the Star Vega">Vega</string>
-    <string name="rigel" translation_description="Name of the Star Rigel">Rigel</string>
-    <string name="procyon" translation_description="Name of the Star Procyon">Procyon</string>
-    <string name="betelgeuse" translation_description="Name of the Star Betelgeuse">Betelgeuse</string>
-    <string name="achernar" translation_description="Name of the Star Achernar">Achernar</string>
-    <string name="hadar" translation_description="Name of the Star Hadar">Hadar</string>
-    <string name="capella" translation_description="Name of the Star Capella">Capella</string>
-    <string name="altair" translation_description="Name of the Star Altair">Altair</string>
-    <string name="acrux" translation_description="Name of the Star Acrux">Acrux</string>
-    <string name="aldebaran" translation_description="Name of the Star Aldebaran">Aldebaran</string>
-    <string name="spica" translation_description="Name of the Star Spica">Spica</string>
-    <string name="antares" translation_description="Name of the Star Antares">Antares</string>
-    <string name="pollux" translation_description="Name of the Star Pollux">Pollux</string>
-    <string name="fomalhaut" translation_description="Name of the Star Fomalhaut">Fomalhaut</string>
-    <string name="deneb" translation_description="Name of the Star Deneb">Deneb</string>
-    <string name="regulus" translation_description="Name of the Star Regulus">Regulus</string>
-    <string name="adhara" translation_description="Name of the Star Adhara">Adhara</string>
-    <string name="shaula" translation_description="Name of the Star Shaula">Shaula</string>
-    <string name="alnath" translation_description="Name of the Star Alnath">Alnath</string>
-    <string name="alnilam" translation_description="Name of the Star Alnilam">Alnilam</string>
-    <string name="alnair" translation_description="Name of the Star Alnair">Alnair</string>
-    <string name="alioth" translation_description="Name of the Star Alioth">Alioth</string>
-    <string name="mirphak" translation_description="Name of the Star Mirphak">Mirphak</string>
-    <string name="kaus_australis" translation_description="Name of the Star Kaus Australis">Kaus Australis</string>
-    <string name="dubhe" translation_description="Name of the Star Dubhe">Dubhe</string>
-    <string name="alkaid" translation_description="Name of the Star Alkaid">Alkaid</string>
-    <string name="alhena" translation_description="Name of the Star Alhena">Alhena</string>
-    <string name="castor" translation_description="Name of the Star Castor">Castor</string>
-    <string name="polaris" translation_description="Name of the Star Polaris">Polaris</string>
-    <string name="alphard" translation_description="Name of the Star Alphard">Alphard</string>
-    <string name="hamal" translation_description="Name of the Star Hamal">Hamal</string>
-    <string name="algieba" translation_description="Name of the Star Algieba">Algieba</string>
-    <string name="diphda" translation_description="Name of the Star Diphda">Diphda</string>
-    <string name="nunki" translation_description="Name of the Star Nunki">Nunki</string>
-    <string name="mirach" translation_description="Name of the Star Mirach">Mirach</string>
-    <string name="alpheratz" translation_description="Name of the Star Alpheratz">Alpheratz</string>
-    <string name="saiph" translation_description="Name of the Star Saiph">Saiph</string>
-    <string name="kochab" translation_description="Name of the Star Kochab">Kochab</string>
-    <string name="rasalhague" translation_description="Name of the Star Rasalhague">Rasalhague</string>
-    <string name="algol" translation_description="Name of the Star Algol">Algol</string>
-    <string name="denebola" translation_description="Name of the Star Denebola">Denebola</string>
-    <string name="alphekka" translation_description="Name of the Star Alphekka">Alphekka</string>
-    <string name="etamin" translation_description="Name of the Star Etamin">Etamin</string>
-    <string name="kaus" translation_description="Name of the Star Kaus">Kaus</string>
-    <string name="shedir" translation_description="Name of the Star Shedir">Shedir</string>
-    <string name="caph" translation_description="Name of the Star Caph">Caph</string>
-    <string name="izar" translation_description="Name of the Star Izar">Izar</string>
-    <string name="merak" translation_description="Name of the Star Merak">Merak</string>
-    <string name="enif" translation_description="Name of the Star Enif">Enif</string>
-    <string name="ankaa" translation_description="Name of the Star Ankaa">Ankaa</string>
-    <string name="phad" translation_description="Name of the Star Phad">Phad</string>
-    <string name="alderamin" translation_description="Name of the Star Alderamin">Alderamin</string>
-    <string name="scheat" translation_description="Name of the Star Scheat">Scheat</string>
-    <string name="markab" translation_description="Name of the Star Markab">Markab</string>
-    <string name="menkar" translation_description="Name of the Star Menkar">Menkar</string>
-    <string name="arneb" translation_description="Name of the Star Arneb">Arneb</string>
-    <string name="unukalhai" translation_description="Name of the Star Unukalhai">Unukalhai</string>
-    <string name="algenib" translation_description="Name of the Star Algenib">Algenib</string>
-    <string name="vindemiatrix" translation_description="Name of the Star Vindemiatrix">Vindemiatrix</string>
-    <string name="alcyone" translation_description="Name of the Star Alcyone">Alcyone</string>
-    <string name="dog_star" translation_description="Name of the Dog Star (Sirius)">Dog Star</string>
-    <string name="north_star" translation_description="Name of the North Star">North Star</string>
-    <string name="pole_star" translation_description="Name of the (North) Pole Star">Pole Star</string>
-    <string name="alpha_centauri" translation_description="Name of the star Alpha Centauri">Alpha Centauri</string>
-    <string name="rigil_kent" translation_description="Name of the star Rigil Kent">Rigil Kent</string>
-    <string name="e_lyrae" translation_description="Name of the star ε Lyrae">ε Lyrae</string>
-
-    <string name="m1" translation_description="Name of the Messier object M1">M1</string>
-    <string name="m2" translation_description="Name of the Messier object M2">M2</string>
-    <string name="m3" translation_description="Name of the Messier object M3">M3</string>
-    <string name="m4" translation_description="Name of the Messier object M4">M4</string>
-    <string name="m5" translation_description="Name of the Messier object M5">M5</string>
-    <string name="m6" translation_description="Name of the Messier object M6">M6</string>
-    <string name="m7" translation_description="Name of the Messier object M7">M7</string>
-    <string name="m8" translation_description="Name of the Messier object M8">M8</string>
-    <string name="m9" translation_description="Name of the Messier object M9">M9</string>
-    <string name="m10" translation_description="Name of the Messier object M10">M10</string>
-    <string name="m11" translation_description="Name of the Messier object M11">M11</string>
-    <string name="m12" translation_description="Name of the Messier object M12">M12</string>
-    <string name="m13" translation_description="Name of the Messier object M13">M13</string>
-    <string name="m14" translation_description="Name of the Messier object M14">M14</string>
-    <string name="m15" translation_description="Name of the Messier object M15">M15</string>
-    <string name="m16" translation_description="Name of the Messier object M16">M16</string>
-    <string name="m17" translation_description="Name of the Messier object M17">M17</string>
-    <string name="m18" translation_description="Name of the Messier object M18">M18</string>
-    <string name="m19" translation_description="Name of the Messier object M19">M19</string>
-    <string name="m20" translation_description="Name of the Messier object M20">M20</string>
-    <string name="m21" translation_description="Name of the Messier object M21">M21</string>
-    <string name="m22" translation_description="Name of the Messier object M22">M22</string>
-    <string name="m23" translation_description="Name of the Messier object M23">M23</string>
-    <string name="m24" translation_description="Name of the Messier object M24">M24</string>
-    <string name="m25" translation_description="Name of the Messier object M25">M25</string>
-    <string name="m26" translation_description="Name of the Messier object M26">M26</string>
-    <string name="m27" translation_description="Name of the Messier object M27">M27</string>
-    <string name="m28" translation_description="Name of the Messier object M28">M28</string>
-    <string name="m29" translation_description="Name of the Messier object M29">M29</string>
-    <string name="m30" translation_description="Name of the Messier object M30">M30</string>
-    <string name="m31" translation_description="Name of the Messier object M31">M31</string>
-    <string name="m32" translation_description="Name of the Messier object M32">M32</string>
-    <string name="m33" translation_description="Name of the Messier object M33">M33</string>
-    <string name="m34" translation_description="Name of the Messier object M34">M34</string>
-    <string name="m35" translation_description="Name of the Messier object M35">M35</string>
-    <string name="m36" translation_description="Name of the Messier object M36">M36</string>
-    <string name="m37" translation_description="Name of the Messier object M37">M37</string>
-    <string name="m38" translation_description="Name of the Messier object M38">M38</string>
-    <string name="m39" translation_description="Name of the Messier object M39">M39</string>
-    <string name="m40" translation_description="Name of the Messier object M40">M40</string>
-    <string name="m41" translation_description="Name of the Messier object M41">M41</string>
-    <string name="m42" translation_description="Name of the Messier object M42">M42</string>
-    <string name="m43" translation_description="Name of the Messier object M43">M43</string>
-    <string name="m44" translation_description="Name of the Messier object M44">M44</string>
-    <string name="m45" translation_description="Name of the Messier object M45">M45</string>
-    <string name="m46" translation_description="Name of the Messier object M46">M46</string>
-    <string name="m47" translation_description="Name of the Messier object M47">M47</string>
-    <string name="m48" translation_description="Name of the Messier object M48">M48</string>
-    <string name="m49" translation_description="Name of the Messier object M49">M49</string>
-    <string name="m50" translation_description="Name of the Messier object M50">M50</string>
-    <string name="m51" translation_description="Name of the Messier object M51">M51</string>
-    <string name="m52" translation_description="Name of the Messier object M52">M52</string>
-    <string name="m53" translation_description="Name of the Messier object M53">M53</string>
-    <string name="m54" translation_description="Name of the Messier object M54">M54</string>
-    <string name="m55" translation_description="Name of the Messier object M55">M55</string>
-    <string name="m56" translation_description="Name of the Messier object M56">M56</string>
-    <string name="m57" translation_description="Name of the Messier object M57">M57</string>
-    <string name="m58" translation_description="Name of the Messier object M58">M58</string>
-    <string name="m59" translation_description="Name of the Messier object M59">M59</string>
-    <string name="m60" translation_description="Name of the Messier object M60">M60</string>
-    <string name="m61" translation_description="Name of the Messier object M61">M61</string>
-    <string name="m62" translation_description="Name of the Messier object M62">M62</string>
-    <string name="m63" translation_description="Name of the Messier object M63">M63</string>
-    <string name="m64" translation_description="Name of the Messier object M64">M64</string>
-    <string name="m65" translation_description="Name of the Messier object M65">M65</string>
-    <string name="m66" translation_description="Name of the Messier object M66">M66</string>
-    <string name="m67" translation_description="Name of the Messier object M67">M67</string>
-    <string name="m68" translation_description="Name of the Messier object M68">M68</string>
-    <string name="m69" translation_description="Name of the Messier object M69">M69</string>
-    <string name="m70" translation_description="Name of the Messier object M70">M70</string>
-    <string name="m71" translation_description="Name of the Messier object M71">M71</string>
-    <string name="m72" translation_description="Name of the Messier object M72">M72</string>
-    <string name="m73" translation_description="Name of the Messier object M73">M73</string>
-    <string name="m74" translation_description="Name of the Messier object M74">M74</string>
-    <string name="m75" translation_description="Name of the Messier object M75">M75</string>
-    <string name="m76" translation_description="Name of the Messier object M76">M76</string>
-    <string name="m77" translation_description="Name of the Messier object M77">M77</string>
-    <string name="m78" translation_description="Name of the Messier object M78">M78</string>
-    <string name="m79" translation_description="Name of the Messier object M79">M79</string>
-    <string name="m80" translation_description="Name of the Messier object M80">M80</string>
-    <string name="m81" translation_description="Name of the Messier object M81">M81</string>
-    <string name="m82" translation_description="Name of the Messier object M82">M82</string>
-    <string name="m83" translation_description="Name of the Messier object M83">M83</string>
-    <string name="m84" translation_description="Name of the Messier object M84">M84</string>
-    <string name="m85" translation_description="Name of the Messier object M85">M85</string>
-    <string name="m86" translation_description="Name of the Messier object M86">M86</string>
-    <string name="m87" translation_description="Name of the Messier object M87">M87</string>
-    <string name="m88" translation_description="Name of the Messier object M88">M88</string>
-    <string name="m89" translation_description="Name of the Messier object M89">M89</string>
-    <string name="m90" translation_description="Name of the Messier object M90">M90</string>
-    <string name="m91" translation_description="Name of the Messier object M91">M91</string>
-    <string name="m92" translation_description="Name of the Messier object M92">M92</string>
-    <string name="m93" translation_description="Name of the Messier object M93">M93</string>
-    <string name="m94" translation_description="Name of the Messier object M94">M94</string>
-    <string name="m95" translation_description="Name of the Messier object M95">M95</string>
-    <string name="m96" translation_description="Name of the Messier object M96">M96</string>
-    <string name="m97" translation_description="Name of the Messier object M97">M97</string>
-    <string name="m98" translation_description="Name of the Messier object M98">M98</string>
-    <string name="m99" translation_description="Name of the Messier object M99">M99</string>
-    <string name="m100" translation_description="Name of the Messier object M100">M100</string>
-    <string name="m101" translation_description="Name of the Messier object M101">M101</string>
-    <string name="m102" translation_description="Name of the Messier object M102">M102</string>
-    <string name="m103" translation_description="Name of the Messier object M103">M103</string>
-    <string name="m104" translation_description="Name of the Messier object M104">M104</string>
-    <string name="m105" translation_description="Name of the Messier object M105">M105</string>
-    <string name="m106" translation_description="Name of the Messier object M106">M106</string>
-    <string name="m107" translation_description="Name of the Messier object M107">M107</string>
-    <string name="m108" translation_description="Name of the Messier object M108">M108</string>
-    <string name="m109" translation_description="Name of the Messier object M109">M109</string>
-    <string name="m110" translation_description="Name of the Messier object M110">M110</string>
-    <string name="ngc6543" translation_description="Name of the Messier object NGC6543">NGC6543</string>
-    <string name="ngc5139" translation_description="Name of the Messier object NGC5139">NGC5139</string>
-    <string name="butterfly_cluster" translation_description="Name of the Messier object Butterfly Cluster">Butterfly Cluster</string>
-    <string name="scorpions_tail" translation_description="Name of the Messier object Scorpion\'s Tail">Scorpion\'s Tail</string>
-    <string name="winnecke_4" translation_description="Name of the Messier object Winnecke 4">Winnecke 4</string>
-    <string name="beehive_cluster" translation_description="Name of the Messier object Beehive Cluster">Beehive Cluster</string>
-    <string name="praesepe" translation_description="Name of the Messier object Praesepe">Praesepe</string>
-    <string name="seven_sisters" translation_description="Name of the Messier object Seven Sisters">Seven Sisters</string>
-    <string name="space_station" translation_description="Name of the Internation Space Station">International Space Station</string>
-    <string name="space_shuttle" translation_description="Name of the Space Shuttle">Space Shuttle</string>
     <string name="kml_load_error">Failed to load KML file</string>
     <string name="load_kml_dialog_title">Load KML</string>
     <string name="load_kml_file">Load</string>
     <string name="enable_analytics">Send usage statistics</string>
     <string name="enable_analytics_desc">Make Sky Map better by sending anonymous data to Google Analytics</string>
-    <string name="leonids" translation_description="Meteor Shower">Leonids</string>
-    <string name="geminids" translation_description="Meteor Shower">Geminids</string>
-    <string name="quadrantids" translation_description="Meteor Shower">Quadrantids</string>
-    <string name="lyrids" translation_description="Meteor Shower">Lyrids</string>
-    <string name="aquariids" translation_description="Meteor Shower">Eta Aquariids</string>
-    <string name="deltaaquariids" translation_description="Meteor Shower">Delta Aquariids</string>
-    <string name="perseids" translation_description="Meteor Shower">Perseids</string>
-    <string name="orionids" translation_description="Meteor Shower">Orionids</string>
-    <string name="puppidvelids" translation_description="Meteor Shower">Puppid-Velids</string>
-    <string name="ursids" translation_description="Meteor Shower">Ursids</string>
 
     <string name="no_sensor_warning">Your device may lack orientation sensors - automode may not work</string>
     <string name="warning_dialog_title">Bad news!</string>
diff --git a/app/src/test/java/com/google/android/stardroid/layers/CometsLayerTest.kt b/app/src/test/java/com/google/android/stardroid/layers/CometsLayerTest.kt
new file mode 100644
index 000000000..6cea0179f
--- /dev/null
+++ b/app/src/test/java/com/google/android/stardroid/layers/CometsLayerTest.kt
@@ -0,0 +1,43 @@
+package com.google.android.stardroid.layers
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Assert
+import org.junit.Test
+import java.lang.IllegalArgumentException
+import java.lang.RuntimeException
+
+const val TOL = 0.0001f
+
+class CometsLayerTest {
+  @Test
+  fun testInterpolator_oneSegment() {
+    val interpolator = CometsLayer.Interpolator(listOf(0, 10), listOf(0f, 2f))
+    assertThat(interpolator.interpolate(0)).isWithin(TOL).of(0f)
+    assertThat(interpolator.interpolate(1)).isWithin(TOL).of(0.2f)
+    assertThat(interpolator.interpolate(5)).isWithin(TOL).of(1.0f)
+    assertThat(interpolator.interpolate(8)).isWithin(TOL).of(1.6f)
+  }
+
+  @Test
+  fun testInterpolator_twoSegments() {
+    val interpolator = CometsLayer.Interpolator(listOf(0, 10, 15), listOf(0f, 2f, 4f))
+    assertThat(interpolator.interpolate(10)).isWithin(TOL).of(2f)
+    assertThat(interpolator.interpolate(15)).isWithin(TOL).of(4f)
+    assertThat(interpolator.interpolate(11)).isWithin(TOL).of(2.4f)
+  }
+
+  @Test(expected = IllegalArgumentException::class)
+  fun testInterpolator_throwsOutOfRange() {
+    CometsLayer.Interpolator(listOf(0, 2, 5), listOf(0f, 2f, 4f)).interpolate(-1)
+  }
+
+  @Test(expected = IllegalArgumentException::class)
+  fun testInterpolator_tooFew() {
+    CometsLayer.Interpolator(listOf(0), listOf(0f))
+  }
+
+  @Test(expected = IllegalArgumentException::class)
+  fun testInterpolator_mismathedsizes() {
+    CometsLayer.Interpolator(listOf(0, 1, 2), listOf(0f, 2f))
+  }
+}
\ No newline at end of file
diff --git a/app/src/test/java/com/google/android/stardroid/math/CoordinateManipulationsTest.kt b/app/src/test/java/com/google/android/stardroid/math/CoordinateManipulationsTest.kt
index b8ed87da4..feeb4d479 100644
--- a/app/src/test/java/com/google/android/stardroid/math/CoordinateManipulationsTest.kt
+++ b/app/src/test/java/com/google/android/stardroid/math/CoordinateManipulationsTest.kt
@@ -13,8 +13,6 @@
 // limitations under the License.
 package com.google.android.stardroid.math
 
-import com.google.android.stardroid.math.MathUtils.cos
-import com.google.android.stardroid.math.MathUtils.sin
 import com.google.android.stardroid.math.RaDec.Companion.fromGeocentricCoords
 import com.google.common.truth.Truth.assertThat
 import org.junit.Test
diff --git a/designdocs/cometlayer.md b/designdocs/cometlayer.md
new file mode 100644
index 000000000..56ad8a387
--- /dev/null
+++ b/designdocs/cometlayer.md
@@ -0,0 +1,16 @@
+# Comet Layer
+To track temporary events like comets we want to have a new layer that
+
+1 Only shows the objects between certain dates (like the meteor shower layer)
+1 Can generate Ra, Dec from a table of positions.
+
+## Requirements
+1 Easy of use: astro data tends to be published as a table of dates and Ra, Dec in hms or dms.
+1 Outside the date range the object should disappear
+1 Flexible. The initial usecase is comets but that might change later.
+
+## Quick design sketch
+We'll have a new Layer for managing the objects (initially just comet leonard and maybe the
+old comet from 2019). Rather than add a new enable/disable button we'll have it show along
+with the planets or meteors layer.
+