diff --git a/manifests/nodes.pp b/manifests/nodes.pp
index dee18f7..e8c48fe 100644
--- a/manifests/nodes.pp
+++ b/manifests/nodes.pp
@@ -15,6 +15,23 @@
   package {"sendmail": ensure => installed }
 }
 
+node 'ruby-187' inherits basenode {
+  rvm_system_ruby {
+    '1.8.7-p358':
+      ensure => 'present',
+      default_use => true,
+  }
+  rvm_gem {
+    'ruby-1.8.7-p358@global/bundler':
+      ensure => latest,
+      require => Rvm_system_ruby['1.8.7-p358'],
+  } 
+}
+
+node 'ruby-187-web' inherits 'ruby-187' {
+  iptables::role { "web-server": }
+}
+
 node 'ruby-193' inherits basenode {
   rvm_system_ruby {
    '1.9.3-p125': 
@@ -51,3 +68,12 @@
   }
 }
 
+node 'en-tesla-ci' inherits 'ruby-187-web' {
+  nginx::unicorn_site { 'edisonnation.com': }
+  rvm_gemset {
+    "ruby-1.8.7-p358@tesla":
+      ensure => present,
+      require => Rvm_system_ruby['1.8.7-p358'],
+  }
+  include mysql::server
+}
\ No newline at end of file
diff --git a/modules/mysql/files/my.cnf b/modules/mysql/files/my.cnf
new file mode 100644
index 0000000..8d78fbf
--- /dev/null
+++ b/modules/mysql/files/my.cnf
@@ -0,0 +1,15 @@
+[client]
+port        = 3306
+socket      = /var/run/mysqld/mysqld.sock
+
+[mysqld_safe]
+socket      = /var/run/mysqld/mysqld.sock
+nice        = 0
+
+[mysqld]
+user        = mysql
+socket      = /var/run/mysqld/mysqld.sock
+port        = 3306
+datadir     = /var/lib/mysql
+
+!includedir /etc/mysql/conf.d/
\ No newline at end of file
diff --git a/modules/mysql/files/my.cnf~ b/modules/mysql/files/my.cnf~
new file mode 100644
index 0000000..b79e618
--- /dev/null
+++ b/modules/mysql/files/my.cnf~
@@ -0,0 +1,12 @@
+[client]
+       port        = 3306
+       socket      = /var/run/mysqld/mysqld.sock
+       [mysqld_safe]
+       socket      = /var/run/mysqld/mysqld.sock
+       nice        = 0
+       [mysqld]
+       user        = mysql
+       socket      = /var/run/mysqld/mysqld.sock
+       port        = 3306
+       datadir     = /var/lib/mysql
+       !includedir /etc/mysql/conf.d/
\ No newline at end of file
diff --git a/modules/mysql/manifests/server.pp b/modules/mysql/manifests/server.pp
new file mode 100644
index 0000000..fcbd1f0
--- /dev/null
+++ b/modules/mysql/manifests/server.pp
@@ -0,0 +1,19 @@
+class mysql::server {
+  package { "mysql-server": ensure => installed }
+  service { "mysql":
+    enable => true,
+    ensure => running,
+    require => Package["mysql-server"],
+  }
+  file { "/etc/mysql/my.cnf":
+    owner   => "mysql", group => "mysql",
+    source  => "puppet:///modules/mysql/my.cnf",
+    notify  => Service["mysql"],
+    require => Package["mysql-server"],
+  }
+  exec { "set-mysql-password":
+    unless => "/usr/bin/mysqladmin -uroot -p${mysql_password} status",
+    command => "/usr/bin/mysqladmin -uroot password ${mysql_password}",
+    require => Service["mysql"],
+  } 
+}
\ No newline at end of file
diff --git a/modules/mysql/manifests/server.pp~ b/modules/mysql/manifests/server.pp~
new file mode 100644
index 0000000..7a3a229
--- /dev/null
+++ b/modules/mysql/manifests/server.pp~
@@ -0,0 +1,19 @@
+class mysql::server {
+  package { "mysql-server": ensure => installed }
+  service { "mysql":
+    enable => true,
+    ensure => running,
+    require => Package["mysql-server"],
+  }
+  file { "/etc/mysql/my.cnf":
+    owner   => "mysql", group => "mysql",
+    source  => "puppet:///mysql/my.cnf",
+    notify  => Service["mysql"],
+    require => Package["mysql-server"],
+  }
+  exec { "set-mysql-password":
+    unless => "/usr/bin/mysqladmin -uroot -p${mysql_password} status",
+    command => "/usr/bin/mysqladmin -uroot password ${mysql_password}",
+    require => Service["mysql"],
+  } 
+}
\ No newline at end of file