diff --git a/lib/display.ex b/lib/display.ex
index e79ab8b..661a58c 100644
--- a/lib/display.ex
+++ b/lib/display.ex
@@ -1,75 +1,39 @@
 defmodule Display do
   alias IO.ANSI
-
-  @no_value :ex_unit_no_meaningful_value
-  @progress_bar_length 30
+  alias Display.ProgressBar
+  alias Display.Intro
+  alias Display.Failure
+  alias Display.Notifications
 
   def invalid_koan(koan, modules) do
-    koans_names = module_names(modules)
-    IO.puts("Did not find koan #{name(koan)} in " <> koans_names )
+    Notifications.invalid_koan(koan, modules)
+    |> IO.puts
   end
 
-  defp module_names(modules) do
-    modules
-    |> Enum.map(&Atom.to_string/1)
-    |> Enum.map(&name/1)
-    |> Enum.join(", ")
-    |> Colours.red
-  end
-
-  defp name("Elixir." <> module), do: module
-  defp name(module), do: name(Atom.to_string(module))
-
   def show_failure(failure, module, name) do
-    IO.puts(format(failure, module, name))
+    format(failure, module, name)
+    |> IO.puts
   end
 
   def format(failure, module, name) do
     """
-    #{intro(module, Tracker.visited)}
+    #{Intro.intro(module, Tracker.visited)}
     Now meditate upon #{format_module(module)}
-    #{progress_bar(Tracker.summarize)}
+    #{ProgressBar.progress_bar(Tracker.summarize)}
     ----------------------------------------
     #{name}
-    #{format_failure(failure)}
+    #{Failure.format_failure(failure)}
     """
   end
 
-  defp intro(module, modules) do
-    if not module in modules do
-      show_intro(module.intro)
-    end
-  end
-
-  defp show_intro(""), do: nil
-  defp show_intro(message) do
-    message <> "\n"
-    |> Colours.green
+  def show_compile_error(error) do
+    Failure.show_compile_error(error)
     |> IO.puts
   end
 
-  def progress_bar(%{current: current, total: total}) do
-    arrow = caluculate_progress(current, total) |> build_arrow
-
-    "|" <> String.ljust(arrow, @progress_bar_length) <> "| #{current} of #{total}"
-  end
-
-  defp caluculate_progress(current, total) do
-    round( (current/total) * @progress_bar_length)
-  end
-
-  defp build_arrow(0), do: ""
-  defp build_arrow(length) do
-    String.duplicate("=", length-1) <> ">"
-  end
-
-  def show_compile_error(error) do
-    IO.puts("")
-    format_error(error) |> IO.puts
-  end
-
   def congratulate do
-    IO.puts(Colours.green("\nYou have learned much. You must find your own path now."))
+    Notifications.congratulate
+    |> IO.puts
   end
 
   def clear_screen do
@@ -79,34 +43,6 @@ defmodule Display do
     end
   end
 
-  defp format_failure(%{error: %ExUnit.AssertionError{expr: @no_value, message: message}, file: file, line: line}) do
-    """
-    #{Colours.cyan("Assertion failed in #{file}:#{line}")}
-    #{Colours.red(message)}
-    """
-  end
-  defp format_failure(%{error: %ExUnit.AssertionError{expr: expr}, file: file, line: line}) do
-    format_assertion_error(expr, file, line)
-  end
-  defp format_failure(%{error: error, file: file, line: line}) do
-    """
-    #{Colours.cyan("Error in #{file}:#{line}")}
-    #{format_error(error)}
-    """
-  end
-
-  defp format_assertion_error(error, file, line) do
-    """
-    #{Colours.cyan("Assertion failed in #{file}:#{line}")}
-    #{Colours.red(Macro.to_string(error))}
-    """
-  end
-
-  defp format_error(error) do
-    trace = System.stacktrace |> Enum.take(2)
-    Colours.red(Exception.format(:error, error, trace))
-  end
-
   defp format_module(module) do
     Module.split(module) |> List.last
   end
diff --git a/lib/display/intro.ex b/lib/display/intro.ex
index 9b62b45..da21587 100644
--- a/lib/display/intro.ex
+++ b/lib/display/intro.ex
@@ -7,7 +7,6 @@ defmodule Display.Intro do
     end
   end
 
-  def show_intro(""), do: nil
   def show_intro(message) do
     message <> "\n"
     |> Colours.green