diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 3daf251..7d8e141 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -2,5 +2,5 @@
 # This playbook contains all of the common things every machine in the site gets.  Basic packages, users, etc etc.
 
 - include: packages.yml
-  #- include: users.yml
+- include: users.yml
   #- include: sudoers.yml
diff --git a/roles/common/tasks/packages.yml b/roles/common/tasks/packages.yml
index a4cf61d..be7a641 100644
--- a/roles/common/tasks/packages.yml
+++ b/roles/common/tasks/packages.yml
@@ -15,4 +15,5 @@
     - w3m-img
     - python-apt
     - python
-    - ansible
+    - python-pip
+    - cowsay
diff --git a/roles/common/tasks/users.yml b/roles/common/tasks/users.yml
index 69628f7..23ee1cd 100644
--- a/roles/common/tasks/users.yml
+++ b/roles/common/tasks/users.yml
@@ -1,12 +1,52 @@
 # This creates a user on the system 
 ---
-- group: name={{ lookup('env', 'LOGNAME') }}
-- user: name={{ lookup('env', 'LOGNAME') }} group={{ lookup('env', 'LOGNAME') }}
-- file: dest=/home/{{ lookup('env', 'LOGNAME') }}/.ssh state=directory
-- copy: src=/home/{{ lookup('env', 'LOGNAME') }}/.ssh/authorized_keys dest=/home/{{ lookup('env', 'LOGNAME') }}/.ssh/authorized_keys owner={{ lookup('env', 'LOGNAME') }} group={{ lookup('env', 'LOGNAME') }} mode=0600
-  ignore_errors: yes
+- group:
+    name: tilde
+    state: present
 
-- group: name=tilde state=present
-- user: name=amcclure group=tilde state=present skeleton=/etc/skel shell=/bin/bash system=no createhome=yes home=/home/amcclure
-- user: name=nagalfar group=tilde state=present skeleton=/etc/skel shell=/bin/bash system=no createhome=yes home=/home/nagalfar
-- user: name=ubergeek group tilde state=present skeleton=/etc/skel shell=/bin/bash system=no createhome=yes home=/home/ubergeek
+- group:
+    name: sudo
+    state: present
+
+- user:
+    name: testuser
+    groups: tilde
+    state: absent
+    shell: /bin/bash       # Defaults to /bin/bash
+    system: no             # Defaults to no
+    createhome: yes        # Defaults to yes
+    home: /home/testuser
+
+- user:
+    name: amcclure
+    groups: tilde, sudo
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/amcclure
+
+- user:
+    name: naglfar
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/naglafar
+
+- user:
+    name: ubergeek
+    groups: sudo
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/ubergeek
+
+  #- user: name=amcclure group=tilde state=present skeleton=/etc/skel shell=/bin/bash system=no createhome=yes home=/home/amcclure
+  #- user: name=nagalfar group=tilde state=present skeleton=/etc/skel shell=/bin/bash system=no createhome=yes home=/home/nagalfar
+  #- user: name=ubergeek group tilde state=present skeleton=/etc/skel shell=/bin/bash system=no createhome=yes home=/home/ubergeek
diff --git a/site.yml b/site.yml
index e4e795f..d9836b0 100644
--- a/site.yml
+++ b/site.yml
@@ -2,7 +2,8 @@
 # This is the overall site playbook.
 - name: Baseline Configuration 
   hosts: all
-  sudo: yes
+  become: yes
+  become_method: sudo
 
   roles:
     - common