diff --git a/include/ansible.sh b/include/ansible.sh
new file mode 100644
index 0000000..02fd79d
--- /dev/null
+++ b/include/ansible.sh
@@ -0,0 +1,24 @@
+	currdir=`pwd`
+	cd $REPO_LOCATION; git pull
+	echo "---
+- name: Setting up $1
+  user:
+    name: $1
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/$1
+- authorized_key:
+    user: $1
+    state: present
+    key: \"$3\"" > $REPO_LOCATION/roles/shell/tasks/users/$YAML_FILE
+
+	echo "- include: users/$YAML_FILE" >> $REPO_LOCATION/roles/shell/tasks/users.yml
+	git add $REPO_LOCATION/roles/shell/tasks/users/$YAML_FILE
+	git commit -am "Adding user $1"
+	git push
+	cd $currdir
+	$GEN_TDP | sudo tee $TILDE_JSON 
diff --git a/include/functions b/include/functions
index cc33a70..f468841 100644
--- a/include/functions
+++ b/include/functions
@@ -34,34 +34,6 @@ makeuser_no_ansible()
 	#sudo toot "welcome new user ~$1!"
 }
 
-makeuser_ansible()
-{
-	currdir=`pwd`
-	cd $REPO_LOCATION; git pull
-	echo "---
-- name: Setting up $1
-  user:
-    name: $1
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/$1
-- authorized_key:
-    user: $1
-    state: present
-    key: \"$3\"" > $REPO_LOCATION/roles/shell/tasks/users/$YAML_FILE
-
-	echo "- include: users/$YAML_FILE" >> $REPO_LOCATION/roles/shell/tasks/users.yml
-	git add $REPO_LOCATION/roles/shell/tasks/users/$YAML_FILE
-	git commit -am "Adding user $1"
-	git push
-	cd $currdir
-	$GEN_TDP | sudo tee $TILDE_JSON 
-}
-
 add_account_recovery()
 {	
 	sudo mkdir -p --mode=700 /home/$1/.thunix
diff --git a/makeuser b/makeuser
index da0d05c..33da937 100755
--- a/makeuser
+++ b/makeuser
@@ -30,7 +30,7 @@ case $1 in
 	add_account_recovery $1 $2
 
 #Thunix specific section
-	makeuser_ansible $1 $2 "$3"
+source include/ansible.sh
 # End Thunix specific section
 		;;