diff --git a/simple-server-project/simple_server/.idea/workspace.xml b/simple-server-project/simple_server/.idea/workspace.xml
diff --git a/simple-server-project/simple_server/aws_cluster_create/views.py b/simple-server-project/simple_server/aws_cluster_create/views.py
@@ -63,7 +63,7 @@ def create_action(region, number, user, ami, instance_type, name, roles, runlist
 
     try:
 
-        return subprocess.check_output(["ruby", "create_cluster.rb", "-r", region, "-n", name, "-N", number, "-u", user,
+        return subprocess.check_output(["ruby", "aws_cluster_creator.rb", "-r", region, "-n", name, "-N", number, "-u", user,
                                         "-a", ami, "-t", instance_type, "--roles", roles,
                                         "--runlist", runlist], cwd=PROVISIONING_DIR, stderr=subprocess.STDOUT)
     except subprocess.CalledProcessError as exc:

diff --git a/simple-server-project/simple_server/azure_cluster_create/forms.py b/simple-server-project/simple_server/azure_cluster_create/forms.py
@@ -26,15 +26,15 @@ class CreateClusterStep1(forms.Form):
 
 class CreateClusterStep2(forms.Form):
 
-    name = forms.CharField(label='Name', max_length=25, required=False, widget=forms.HiddenInput())
-    image_id = forms.CharField(label='Image Id', max_length=25, required=False, widget=forms.HiddenInput())
-    vm_size = forms.CharField(label='VM Size', max_length=25, required=False, widget=forms.HiddenInput())
-    location = forms.CharField(label='Location', max_length=12, required=False, widget=forms.HiddenInput())
-    number = forms.CharField(label='Number', max_length=2, required=False, widget=forms.HiddenInput())
-    password = forms.CharField(label='Password', max_length=12, required=False, widget=forms.HiddenInput())
-    cloud_service_name = forms.CharField(label='Cloud Service Name', max_length=12, required=False, widget=forms.HiddenInput())
-    storage_account_name = forms.CharField(label='Storage Account Name', max_length=12, required=False, widget=forms.HiddenInput())
-    tcp_endpoints = forms.CharField(label='TCP Endpoints', max_length=12, required=False, widget=forms.HiddenInput())
+    name = forms.CharField(label='Name', max_length=25, required=False)
+    image_id = forms.CharField(label='Image Id', max_length=125, required=False)
+    vm_size = forms.CharField(label='VM Size', max_length=25, required=False)
+    location = forms.CharField(label='Location', max_length=12, required=False)
+    number = forms.CharField(label='Number', max_length=2, required=False)
+    password = forms.CharField(label='Password', max_length=12, required=False)
+    cloud_service_name = forms.CharField(label='Cloud Service Name', max_length=12, required=False)
+    storage_account_name = forms.CharField(label='Storage Account Name', max_length=12, required=False)
+    tcp_endpoints = forms.CharField(label='TCP Endpoints', max_length=12, required=False)
     roles = forms.CharField(label='Roles', max_length=40, required=False)
     runlist = forms.CharField(label='Runlist', max_length=40, required=False)
 
diff --git a/simple-server-project/simple_server/azure_cluster_create/views.py b/simple-server-project/simple_server/azure_cluster_create/views.py
@@ -72,13 +72,14 @@ def azure_cluster_creator_step3(request):
             return render(request, 'azure_cluster_creator_step3.html', context)
 
 
-def create_action(region, number, user, ami, instance_type, name, roles, runlist,
+
+def create_action(location, number, password, image_id, vm_size, name, roles, runlist,
                   cloud_service_name, storage_account_name, tcp_endpoints):
 
     try:
 
-        return subprocess.check_output(["ruby", "azure_cluster_creator.rb", "-r", region, "-n", name, "-N", number, "-u", user,
-                                        "-a", ami, "-t", instance_type, "--roles", roles,
+        return subprocess.check_output(["ruby", "azure_cluster_creator.rb", "-l", location, "-n", name, "-N", number, "-p", password,
+                                        "-i", image_id, "-s", vm_size, "--roles", roles,
                                         "--runlist", runlist, "--cloud_service_name", cloud_service_name,
                                         "--storage_account_name", storage_account_name,
                                         "tcp_endpoints", tcp_endpoints], cwd=PROVISIONING_DIR, stderr=subprocess.STDOUT)

diff --git a/simple-server-project/simple_server/simple_server/urls.py b/simple-server-project/simple_server/simple_server/urls.py
@@ -18,6 +18,7 @@
 from node_list.views import NodeList
 from cluster_create.views import cluster_creator
 from aws_cluster_create.views import aws_cluster_creator_step1, aws_cluster_creator_step2, aws_cluster_creator_step3
+from azure_cluster_create.views import azure_cluster_creator_step1, azure_cluster_creator_step2, azure_cluster_creator_step3
 
 urlpatterns = [
     url(r'^$', Home.as_view()),
@@ -26,5 +27,8 @@
     url(r'^aws_cluster_creator_step1$', aws_cluster_creator_step1, name='aws_cluster_creator_step1'),
     url(r'^aws_cluster_creator_step2$', aws_cluster_creator_step2, name='aws_cluster_created_step2'),
     url(r'^aws_cluster_creator_step3$', aws_cluster_creator_step3, name='aws_cluster_created_step3'),
+    url(r'^azure_cluster_creator_step1$', azure_cluster_creator_step1, name='azure_cluster_creator_step1'),
+    url(r'^azure_cluster_creator_step2$', azure_cluster_creator_step2, name='azure_cluster_created_step2'),
+    url(r'^azure_cluster_creator_step3$', azure_cluster_creator_step3, name='azure_cluster_created_step3'),
 
 ]
diff --git a/simple-server-project/simple_server/templates/azure_cluster_creator_step1.html b/simple-server-project/simple_server/templates/azure_cluster_creator_step1.html
@@ -0,0 +1,18 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+    <h2>Choose a Server size and OS:</h2>
+
+    <br>
+
+    <form action="azure_cluster_creator_step2" method="post">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <input type="submit" value="Submit" /> <a href="https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-size-specs/" ><p align="right">More info</p></a>
+    </form>
+
+
+
+
+{% endblock content %}
diff --git a/simple-server-project/simple_server/templates/azure_cluster_creator_step2.html b/simple-server-project/simple_server/templates/azure_cluster_creator_step2.html
@@ -0,0 +1,17 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+    <h2>Choose Software to install:</h2>
+
+    <br>
+
+    <form action="azure_cluster_creator_step3" method="post">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <input type="submit" value="Submit" />
+    </form>
+
+
+
+{% endblock content %}
diff --git a/simple-server-project/simple_server/templates/azure_cluster_creator_step3.html b/simple-server-project/simple_server/templates/azure_cluster_creator_step3.html
@@ -0,0 +1,22 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+
+
+    <h3>Creating Server:</h3> <br><br>
+    <b>Image Id:</b> {{  image_id }}<br>
+    <b>Name Tag:</b> {{  name }} <br>
+    <b>VM Size:</b> {{  vm_size }} <br>
+    <b>Roles:</b> {{ roles }} <br>
+    <b>Runlist:</b> {{ runlist }} <br><br><br><br>
+
+    {% for line in output %}
+
+    {{ line }}<br>
+
+    {% endfor %}
+
+
+
+{% endblock content %}