Index: accounts.php
===================================================================
--- accounts.php	(revision 44a48a17998db7faff8a4e6d3f7feddbdfd630b9)
+++ accounts.php	(revision 568ed4e6b94ea54c27b04a537ac74f78f44fe42c)
@@ -96,17 +96,17 @@
 		<div class="orgs_by_admin" id="orgs_by_admin">
 			<h2>Delete Administrator</h2>
+			<div id="meraki_status"><pre>Current status: Awaiting user input</pre></div>
+			<div class="meraki_container meraki_form">
 			
-			<div class="key">
-				<label for="api-key">Your API Key: </label>
-				<input type="password" name="api-key" id="api-key" length="40" />
-				<input type="button" name="next1" id="next1" value="Next" onclick="get_admins_remove()">
+				<?php rw_key_fields(); ?>
+				
+				<input type="button" class="meraki_button" name="meraki_next1" id="meraki_next1" value="Next" onclick="get_admins_by_org();">
 			</div>
-			
-			<div class="adminsOutput" id="adminsOutput">
+			<div class="meraki_admins_output" id="meraki_admins_output">
 				<!--Dropdown list of Admins -->
 				<!--Next -->
 			</div>
 			
-			<div class="orgsOutput" id="orgsOutput">
+			<div class="meraki_orgs_output" id="meraki_orgs_output">
 				<!-- Checkboxes for orgs -->
 				<!-- Remove -->
@@ -114,8 +114,9 @@
 			
 			
+			
 		</div>
 		
 		<script>
-			
+			var page = "delete_admin";
 		</script>
 
@@ -131,5 +132,5 @@
 			<div class="meraki_container meraki_form">
 			
-				<?php ro_key_fields(); ?> <!--TODO:  needs to be RW ONLY-->
+				<?php rw_key_fields(); ?>
 				
 				<div class="meraki_row">
Index: include.css
===================================================================
--- include.css	(revision 44a48a17998db7faff8a4e6d3f7feddbdfd630b9)
+++ include.css	(revision 568ed4e6b94ea54c27b04a537ac74f78f44fe42c)
@@ -55,5 +55,12 @@
 }
 
-.meraki_key {
+.meraki_button_warning {
+	background-color: rgb(255, 0, 0);
+	font-color: rgb(255, 255, 255);
+	color: rgb(255, 255, 255);
+	font-weight: bold;
+}
+
+.meraki_ro_key {
 	display:none;
 }
Index: include.js
===================================================================
--- include.js	(revision 44a48a17998db7faff8a4e6d3f7feddbdfd630b9)
+++ include.js	(revision 568ed4e6b94ea54c27b04a537ac74f78f44fe42c)
@@ -9,7 +9,7 @@
 		var checkbox = event.target;
 		if (checkbox.checked) {
-			$(".meraki_key").hide();
+			$(".meraki_ro_key").hide();
 		} else {
-			$(".meraki_key").css('display', 'table-row');
+			$(".meraki_ro_key").css('display', 'table-row');
 		}
 	});
@@ -75,5 +75,6 @@
 		print_orgs_to_add_admin();
 	}
-	else if ( page == "remove_admin" ) {
+	else if ( page == "delete_admin" ) {
+		print_select_admin_to_remove();
 	}
 	else {
@@ -187,5 +188,5 @@
 	
 	$('#meraki_orgsOutput').append('\
-		<p><div class="meraki_row">Please select the organisations to add this user to:</p></div>\
+		<div class="meraki_row"><p>Please select the organisations to add this user to:</p></div>\
 	');
 	
@@ -271,4 +272,119 @@
 }
 
+function print_select_admin_to_remove() {
+	status_update('Sorting and generating output...');
+	
+	admins = group_orgs_by_admin();
+	
+	$('#meraki_admins_output').html('<select id="meraki_admin" name="meraki_admin"></select>');
+	
+	$.each ( admins, function (j) {
+		$('#meraki_admin').append('<option value="'+j+'">'+j+' ('+this.name+')</option>');
+	});
+	
+	$('#meraki_admins_output').append('\
+		<div class="meraki_row">\
+			<input type="button" class="meraki_button" name="meraki_next2" id="meraki_next2" value="Next" onclick="get_orgs_for_admin();"\
+		</div>\
+	');
+	status_update('Waiting for user input...');
+}
+
+function get_orgs_for_admin() {
+	status_update('Sorting and generating output...');
+	
+	$('#meraki_admins_output').hide();
+	
+	var admin_to_remove = $('#meraki_admin').val();
+	
+	sorted = orgs.sort(function(a, b) { return (a.name < b.name)?-1:((b.name < a.name)?1:0); });
+	orgs = sorted;
+
+	admins = group_orgs_by_admin();
+	
+	$('#meraki_orgs_output').append('\
+		<div class="meraki_row"><p>Please select the organisations to remove this user from:</p></div>\
+	');
+	
+	$.each (orgs, function (k) {
+		$('#meraki_orgs_output').append('<div class="meraki_row" id="meraki_orgs_'+k+'"></div>');
+		$('#meraki_orgs_'+k).append('\
+			<div class="meraki_left">\
+				<label for="meraki_org_'+orgs[k].id+'">\
+					'+orgs[k].name+'\
+				</label>\
+			</div>\
+		');
+		$('#meraki_orgs_'+k).append('\
+			<div class="meraki_middle">\
+				<input type="checkbox" name="org_checkboxes[]" value="'+orgs[k].id+'" id="meraki_org_'+orgs[k].id+'" disabled />\
+			</div>\
+		');
+		
+		$('#meraki_orgs_'+k).append('<div class="meraki_right" id="meraki_org_output_'+orgs[k].id+'" ></div>');
+		$('#meraki_org_output_'+orgs[k].id).html('Not an admin');
+		$('#meraki_org_output_'+orgs[k].id).addClass('meraki_success');
+		$('#meraki_orgs_'+k).hide();
+		
+		if ( orgs[k].administrator == "ERROR") {
+			$('#meraki_org_'+orgs[k].id).attr('disabled','disabled');
+			$('#meraki_org_output_'+orgs[k].id).html('Unable to read data');
+			$('#meraki_org_output_'+orgs[k].id).addClass('meraki_failure');
+			$('#meraki_orgs_'+k).hide();
+		}
+		
+		$.each ( admins[admin_to_remove], function (j) {
+			if ( admins[admin_to_remove][j].id == orgs[k].id ) {
+				$('#meraki_org_'+orgs[k].id).removeAttr('disabled');
+				$('#meraki_orgs_'+k).css('display', 'table-row');
+				$('#meraki_org_'+orgs[k].id).val(orgs[k].id + ':' + admins[admin_to_remove][j].orgAdminId)
+				$('#meraki_org_output_'+orgs[k].id).html('');
+				$('#meraki_org_output_'+orgs[k].id).removeClass('meraki_success');
+			}
+		});
+	});
+	$('#meraki_orgs_output').append('\
+		<div class="meraki_row">\
+			<input type="button" class="meraki_button class meraki_button_warning" name="meraki_go" id="meraki_go" value="DELETE from Selected Organisations" onclick="remove_admin();">\
+		</div>\
+	');
+	status_update('Waiting for user input...');
+}
+
+function remove_admin() {
+    status_update("Removing admin...");
+	$("#meraki_go").hide();
+	
+
+	$(':checkbox[name="org_checkboxes[]"]:checked').each( function () {
+	var ids = this.value.split(':');
+	var org_id = ids[0];
+	var admin_id = ids[1];
+	$('#meraki_org_output_'+org_id).html('Removing...');
+		$.ajax({
+			dataType: "json",
+			url: "api.php",
+			method: "post",
+			data: {
+				action: 	"delete_org_admin",
+				orgid:		org_id,
+				adminid:	admin_id
+			},
+			success: function (r) {on_del_admin_success(r, org_id);},
+			error: function (x, s, e) {on_del_admin_error(e, org_id);}
+		});
+	});
+}
+
+function on_del_admin_success(r, org_id) {
+	$('#meraki_org_output_'+org_id).html('Success')
+	$('#meraki_org_output_'+org_id).addClass('meraki_success');
+}
+
+function on_del_admin_error(e, org_id) {
+	$('#meraki_org_output_'+org_id).html('Error: '+e);
+	$('#meraki_org_output_'+org_id).addClass('meraki_failure');
+}
+
 //GET LICENCES
 
Index: include.php
===================================================================
--- include.php	(revision 44a48a17998db7faff8a4e6d3f7feddbdfd630b9)
+++ include.php	(revision 568ed4e6b94ea54c27b04a537ac74f78f44fe42c)
@@ -15,9 +15,21 @@
 					</div>
 				</div>
-				<div class="meraki_row meraki_key">
+				<div class="meraki_row meraki_ro_key">
 					<div class="meraki_left">
 							<label for="merkai_api_key">Your API Key: </label>
 					</div>
 					<div class="meraki_right">
+						<input type="password" name="meraki_api_key" id="meraki_api_key" length="40" />
+					</div>
+				</div>
+<?php }
+
+function rw_key_fields() { ?>
+				<div class="meraki_row meraki_rw_key">
+					<div class="meraki_left">
+							<label for="merkai_api_key">Your API Key: </label>
+					</div>
+					<div class="meraki_right">
+						<input type="checkbox" name="meraki_ro_key" id="meraki_ro_key" value="rokey" style="display:none" disabled>
 						<input type="password" name="meraki_api_key" id="meraki_api_key" length="40" />
 					</div>