diff --git a/.env.example b/.env.example
new file mode 100644
index 0000000..ab9c29f
--- /dev/null
+++ b/.env.example
@@ -0,0 +1,2 @@
+DB_USERNAME=
+DB_PASSWORD=
diff --git a/Gemfile b/Gemfile
index 59def56..00276b5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,6 +20,7 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 group :development do
   gem 'sqlite3'
+  gem 'pg'
   gem 'meta_request'
   gem 'web-console'
   gem "awesome_print", require:"ap"
@@ -29,6 +30,7 @@ group :development, :test do
   gem 'rspec-rails', '~> 3.6'
   gem 'bullet', '~> 5.6'
   gem 'bundler-audit', '~> 0.6', require: false
+  gem 'dotenv-rails'
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 369b80c..1eb854e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -107,6 +107,10 @@ GEM
     docile (1.1.5)
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.2.1)
+    dotenv-rails (2.2.1)
+      dotenv (= 2.2.1)
+      railties (>= 3.2, < 5.2)
     equalizer (0.0.11)
     erubis (2.7.0)
     execjs (2.7.0)
@@ -215,6 +219,8 @@ GEM
     parser (2.4.0.0)
       ast (~> 2.2)
     path_expander (1.0.2)
+    pg (0.21.0)
+    pg (0.21.0-x86-mingw32)
     powerpack (0.1.1)
     procto (0.0.3)
     public_suffix (3.0.0)
@@ -410,6 +416,7 @@ DEPENDENCIES
   coffee-rails (~> 4.2)
   database_cleaner (~> 1.6)
   devise
+  dotenv-rails
   factory_girl_rails (~> 4.6)
   faker (~> 1.7)
   fuubar (~> 2.2.0)
@@ -420,6 +427,7 @@ DEPENDENCIES
   meta_request
   metric_fu (~> 4.12.0)
   paperclip
+  pg
   puma (~> 3.0)
   rails (~> 5.0.1)
   rails_admin
diff --git a/config/database.yml b/config/database.yml
index aecd0d5..82428f9 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,17 +1,31 @@
+# IF YOU WANT TO USE POSTGRESQL FOR DEVELOPMENT!!!!
 default: &default
-  adapter: sqlite3
+  adapter: postgresql
+  encoding: unicode
   # For details on connection pooling, see rails configuration guide
   # http://guides.rubyonrails.org/configuring.html#database-pooling
-  pool: 5
-  timeout: 5000
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
 
 development:
   <<: *default
-  database: db/development.sqlite3
+  database: beeconnect_development
+  # username: <%= ENV['DB_USERNAME'] %>
+  # password: <%= ENV['DB_PASSWORD'] %>
 
-test:
-  <<: *default
-  database: db/test.sqlite3
+# default: &default
+#   adapter: sqlite3
+#   # For details on connection pooling, see rails configuration guide
+#   # http://guides.rubyonrails.org/configuring.html#database-pooling
+#   pool: 5
+#   timeout: 5000
+#
+# development:
+#   <<: *default
+#   database: db/development.sqlite3
+#
+# test:
+#   <<: *default
+#   database: db/test.sqlite3
 
 production:
   adapter: mysql2