diff --git a/manifests/ee_ay1_users.pp b/manifests/ee_ay1_users.pp
new file mode 100644
index 0000000000000000000000000000000000000000..895c484340c125cc04454dd681d3f72aa9e4c797
--- /dev/null
+++ b/manifests/ee_ay1_users.pp
@@ -0,0 +1,26 @@
+# Class: users::ee_ay1_users
+#
+# This module manages users and groups for ee-ay1 Dell Precision T1650 workstation
+#
+# Parameters: none
+#
+# Actions:
+#
+# Requires: see Modulefile
+#
+# Sample Usage:
+#
+class users::ee_ay1_users inherits users::virtual_users
+{
+  User["gmyers"]        { gid => ["gmyers"],   groups => ["ee"] }
+  User["yildirim"]      { gid => ["yildirim"], groups => ["ee"] }
+
+  # Realize full time users of ee-ay1 
+  realize(
+    Group["ee"],
+    User["gmyers"],
+    Group["gmyers"],
+    User["yildirim"],
+    Group["yildirim"],
+  )
+}
diff --git a/manifests/ee_yg1_users.pp b/manifests/ee_yg1_users.pp
deleted file mode 100644
index 07a221c5ffe6046a0c842d631d33c4bcd71a4096..0000000000000000000000000000000000000000
--- a/manifests/ee_yg1_users.pp
+++ /dev/null
@@ -1,26 +0,0 @@
-# Class: users::ee_yg1_users
-#
-# This module manages users and groups for ee-yg1 R420 server
-#
-# Parameters: none
-#
-# Actions:
-#
-# Requires: see Modulefile
-#
-# Sample Usage:
-#
-class users::ee_yg1_users inherits users::virtual_users
-{
-  User["gaoyi"]         { gid => ["gaoyi"],    groups => ["ee"] }
-  User["gmyers"]        { gid => ["gmyers"],   groups => ["ee"] }
-
-  # Realize full time users of ee-yg1 
-  realize(
-    Group["ee"],
-    User["gaoyi"],
-    Group["gaoyi"],
-    User["gmyers"],
-    Group["gmyers"],
-  )
-}
diff --git a/manifests/mephisto_users.pp b/manifests/mephisto_users.pp
index 5002fba3f27401ad5e7e3b0044464f5f326455ea..150091763c7e0ccf85e4690f8c45fd2cb8dc7500 100644
--- a/manifests/mephisto_users.pp
+++ b/manifests/mephisto_users.pp
@@ -68,7 +68,9 @@ class users::mephisto_users inherits users::virtual_users
       User["harongjr"]       { gid => ["harongjr"], groups +> ["me"] }
       User["kmelliso"]       { gid => ["kmelliso"], groups +> ["me"] }
       User["kschrum"]        { gid => ["kschrum"],  groups +> ["me"] }
+      User["miskosr"]        { gid => ["miskosr"],  groups +> ["me"] }
       User["mmullane"]       { gid => ["mmullane"], groups +> ["me"] }
+      User["rafaelc"]        { gid => ["rafaelc"],  groups +> ["me"] }
 
       # Add shum and dino-theodorou to group citronelle
       User["sam9412"]        { gid    => ["sam9412"], groups => ["etlab"] }
@@ -188,6 +190,8 @@ class users::mephisto_users inherits users::virtual_users
         User["marker"],
         User["mcglowna"],
         User["mek"],
+        User["miskosr"],
+        Group["miskosr"],
         User["mmullane"],
         Group["mmullane"],
         User["msalama"],
@@ -199,6 +203,8 @@ class users::mephisto_users inherits users::virtual_users
         User["prapanj"],
         User["psw22"],
         User["pwalsh"],
+        User["rafaelc"],
+        Group["rafaelc"],
         User["rcloud"],
         User["roy"],
         User["sakles"],
diff --git a/manifests/virtual_groups.pp b/manifests/virtual_groups.pp
index 3be4db244916a64bc0b9c6f468aa1138708bae3e..83f3c616402a68352b12dc9d392ba22f49cc548e 100644
--- a/manifests/virtual_groups.pp
+++ b/manifests/virtual_groups.pp
@@ -2240,5 +2240,17 @@ class users::virtual_groups
     gid     => "10612",
     ensure  => "present",
   }
+  @group { "yildirim":
+    gid     => "10613",
+    ensure  => "present",
+  }
+  @group { "rafaelc":
+    gid     => "10614",
+    ensure  => "present",
+  }
+  @group { "miskosr":
+    gid     => "10615",
+    ensure  => "present",
+  }
 
 }
diff --git a/manifests/virtual_users.pp b/manifests/virtual_users.pp
index 80b55948aefa9db5806ada3de15df2b7e6871710..a568395a5aa507dd50a181bdf60c957492355b34 100644
--- a/manifests/virtual_users.pp
+++ b/manifests/virtual_users.pp
@@ -5991,5 +5991,29 @@ class users::virtual_users
     comment    => "Christopher E Arias, cearias@uab.edu, CIVIL, Nasim Uddin (nuddin@uab.edu)",
     managehome => true,
   }
+  # 20141007 - Added new ENG user yildirim possible future Cheaha user - 
+  @user { "yildirim":
+    ensure     => "present",
+    uid        => "10613",
+    gid        => "ee",
+    comment    => "Abidin Yildirim, yildirim@uab.edu, EE, Abidin Yildirim (yildirim@uab.edu)",
+    managehome => true,
+  }
+  # 20141007 - Added new ENG user rafaelc possible future Cheaha user - 
+  @user { "rafaelc":
+    ensure     => "present",
+    uid        => "10614",
+    gid        => "me",
+    comment    => "Rafael T Correa, rafaelc@uab.edu, ME, Corey Shum (shum@uab.edu)",
+    managehome => true,
+  }
+  # 20141007 - Added new ENG user miskosr possible future Cheaha user - 
+  @user { "miskosr":
+    ensure     => "present",
+    uid        => "10615",
+    gid        => "me",
+    comment    => "Samuel R Misko, miskosr@uab.edu, ME, Corey Shum (shum@uab.edu)",
+    managehome => true,
+  }
 
 }