diff --git a/config.ru b/config.ru
index 751d9e2..f8ac385 100755
--- a/config.ru
+++ b/config.ru
@@ -1,12 +1,4 @@
-require 'bundler/setup'
-require 'sinatra/base'
+require './environment'
+require './permitmapping'
 
-use Rack::Session::Cookie
-
-class App < Sinatra::Base
-	get '/' do
-		erb :index
-	end
-end
-
-run App.new
+run PermitMapping.new
diff --git a/environment.rb b/environment.rb
new file mode 100644
index 0000000..929cf35
--- /dev/null
+++ b/environment.rb
@@ -0,0 +1,19 @@
+require 'rubygems'
+require 'bundler'
+Bundler.require
+
+# Setup defaults
+ROOT = File.expand_path(File.dirname(__FILE__))  
+
+#DataMapper::Logger.new($stdout, :debug)
+
+# A Sqlite3 connection to a persistent database
+#DataMapper.setup(:default, "sqlite:///#{ROOT}/data/permits.db")
+#DataMapper.setup(:default, 'postgres://postgres:postgres@192.168.2.165/omaha-building-permits')
+#DataMapper.setup(:default, "sqlite:///tmp/permits.db")
+
+require 'open-uri'
+require 'uri'
+
+# Database stuff
+require './lib/models'
diff --git a/permitmapping.rb b/permitmapping.rb
new file mode 100644
index 0000000..bb78da5
--- /dev/null
+++ b/permitmapping.rb
@@ -0,0 +1,7 @@
+use Rack::Session::Cookie
+
+class App < Sinatra::Base
+        get '/' do
+                erb :index
+        end
+end