diff --git a/shell/search-thread.sml b/shell/search-thread.sml
index 5d0ed11..e15bbd7 100644
--- a/shell/search-thread.sml
+++ b/shell/search-thread.sml
@@ -2,12 +2,11 @@ structure SearchThread =
 struct
   open CML
 
-  (* Prerequisite to sending message: move buffer to end. *)
   fun loop () =
     let
       val (buffer, dfa, time) = Mailbox.recv SearchMailbox.mailbox
-      val searchList =
-        raise Fail "todo: reimplement full builder for searchList"
+      val iterator = LineGap.makeStringIterator buffer
+      val searchList = SearchList.build (iterator, dfa)
       val msg = InputMsg.WITH_SEARCH_LIST (searchList, time)
       val () = InputMailbox.append msg
     in