diff --git a/Gemfile b/Gemfile
index af46db7..de168e9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,14 @@
-gem 'erb'
+gem 'roda'
 gem 'rackup'
 
+# For parsing html and making the sidebar. Very fast
 gem 'nokogiri'
+
+# Markdown converter.  Uses native C code
 gem 'redcarpet'
+
+# For parsing config.  Also uses native C code and bindings, fast.
+gem 'tomlib'
+
+# embeded ruby templating lanuage
+gem 'erb'
diff --git a/app.rb b/app.rb
index 7289fbf..a8445a1 100644
--- a/app.rb
+++ b/app.rb
@@ -1,5 +1,5 @@
 
-require 'sinatra'
+require 'roda'
 require 'erb'
 require 'nokogiri'
 require 'redcarpet'
@@ -16,8 +16,7 @@ class Config
     @approved_regex = Regexp.union(approved_files)
     toml = Tomlib.load(File.read "config.toml")
 
-    @layout = toml["layout"] || "layout"
-    @layout = @layout.to_sym
+    @layout = toml["layout"] || "layout.erb"
     # @layout = :layout
     
   end
@@ -26,6 +25,7 @@ end
 $config = Config.new();
 
 class Sidebar
+  attr_reader :tree
   FileNode = Struct.new(:type, :path, :name)
   DirNode = Struct.new(:type, :path, :name, :files)
 
@@ -45,6 +45,7 @@ class Sidebar
   end
 
   def html
+    return @html if defined?(@html)
     builder = Nokogiri::HTML::Builder.new do |doc|
       def deal_with_dir (doc, dir, path)
         doc.li {
@@ -67,7 +68,7 @@ class Sidebar
         deal_with_dir doc, @tree, @tree.path
       }
     end
-    builder.to_html().split(/\n/)[1..-1].join
+    @html = builder.to_html().split(/\n/)[1..-1].join
   end
   
   private
@@ -105,29 +106,79 @@ end
 $sidebar = Sidebar.new
 
 
-class Perc < Sinatra::Application
-  set :views, "."
-  set :markdown, :layout_engine => :erb
-  # @sidebar = Sidebar.new
+class App < Roda
+
+  route do |r|
+    r.root do
+      pview "main.erb"
+    end
+
+    process_dir r, $sidebar.tree, "."
+    
+  end
+
+    # Now the saga begins,we transform file_tree into a routing tree
+    def process_dir (r, dir, cdir)
+      p = Proc.new do
+        dir.files.each do |f|
+          dd = File.join(cdir, f.path)
+          if f.type == :dir
+            # f is dir
+            process_dir r, f, dd
+          else
+            # f is a file
+            r.get f.path do
+              pview dd
+            end
+          end
+        end
+        "Whatup"
+      end
+      if dir.path == "."
+        p.call
+      else
+        r.on dir.path do
+          p.call
+        end
+      end
+    end
+
+  def tree
+    $sidebar.html
+  end
   
-  get "/" do
-    erb :main, layout: $config.layout
-  end
-
-  get "/*.*" do |path, ext|
-    if ext == "md"
-      md = markdown File.read(path + ".md"), layout: $config.layout
-      
-    else
-      erb path.to_sym, layout: $config.layout
-    end
-  end
-
-  helpers do
-    def tree
-      $sidebar.html
-    end
+  def pview(file)
+    layout = $config.layout
+    tp = ERB.new(File.read(file))
+    body = tp.result(binding)
+    ERB.new(File.read(layout)).result(binding)
   end
   
 end
 
+# class Perc < Sinatra::Application
+#   set :views, "."
+#   set :markdown, :layout_engine => :erb
+#   # @sidebar = Sidebar.new
+  
+#   get "/" do
+#     erb :main, layout: $config.layout
+#   end
+
+#   get "/*.*" do |path, ext|
+#     if ext == "md"
+#       md = markdown File.read(path + ".md"), layout: $config.layout
+      
+#     else
+#       erb path.to_sym, layout: $config.layout
+#     end
+#   end
+
+#   helpers do
+#     def tree
+#       $sidebar.html
+#     end
+#   end
+  
+# end
+
diff --git a/config.ru b/config.ru
index 33d7cb7..5b106e2 100644
--- a/config.ru
+++ b/config.ru
@@ -1,2 +1,2 @@
 require './app'
-run Perc
+run App