diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index c24f87e0da..9a6f000f2b 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -1826,14 +1826,220 @@
 /obj/admins/proc/player()
 	if (!usr.client.holder)
 		return
-	var/dat = "<html><head><title>Player Menu</title></head>"
-	dat += "<body><table border=1 cellspacing=5><B><tr><th>Name</th><th>Real Name</th><th>Assigned Job</th><th>Key</th><th>Options</th><th>PM</th><th>Traitor?</th><th>Karma</th></tr></B>"
-	//add <th>IP:</th> to this if wanting to add back in IP checking
-	//add <td>(IP: [M.lastKnownIP])</td> if you want to know their ip to the lists below
+	var/dat = "<html><head><title>Player Panel</title></head>"
+
+	//javascript, the part that does most of the work~
+	dat += {"
+
+		<head>
+			<script type='text/javascript'>
+
+				var locked_tabs = new Array();
+
+				function updateSearch(){
+
+
+					var filter_text = document.getElementById('filter');
+					var filter = filter_text.value.toLowerCase();
+
+					if(complete_list != null && complete_list != ""){
+						var mtbl = document.getElementById("maintable_data_archive");
+						mtbl.innerHTML = complete_list;
+					}
+
+					if(filter.value == ""){
+						return;
+					}else{
+
+						var maintable_data = document.getElementById('maintable_data');
+						var ltr = maintable_data.getElementsByTagName("tr");
+						for ( var i = 0; i < ltr.length; ++i )
+						{
+							try{
+								var tr = ltr\[i\];
+								if(tr.getAttribute("id").indexOf("data") != 0){
+									continue;
+								}
+								var ltd = tr.getElementsByTagName("td");
+								var td = ltd\[0\];
+								var lsearch = td.getElementsByTagName("b");
+								var search = lsearch\[0\];
+								//var inner_span = li.getElementsByTagName("span")\[1\] //Should only ever contain one element.
+								//document.write("<p>"+search.innerText+"<br>"+filter+"<br>"+search.innerText.indexOf(filter))
+								if ( search.innerText.toLowerCase().indexOf(filter) == -1 )
+								{
+									//document.write("a");
+									//ltr.removeChild(tr);
+									td.innerHTML = "";
+									i--;
+								}
+							}catch(err) {   }
+						}
+					}
+
+					var count = 0;
+					var index = -1;
+					var debug = document.getElementById("debug");
+
+					locked_tabs = new Array();
+
+				}
+
+				function expand(id,job,name,real_name,image,key,ip,antagonist,karma,ref){
+
+					clearAll();
+
+					var span = document.getElementById(id);
+
+					body = "<table><tr><td>";
+
+					body += "</td><td align='center'>";
+
+					body += "<font size='2'><b>"+job+" "+name+"</b><br><b>Real name "+real_name+"</b><br><b>Played by "+key+" ("+ip+")</b></font>"
+
+					body += "</td><td align='center'>";
+
+					body += "<a href='?src=\ref[src];adminplayeropts="+ref+"'>PP</a> - "
+					body += "<a href='?src=\ref[src];adminplayervars="+ref+"'>VV</a> - "
+					body += "<a href='?src=\ref[usr];priv_msg=\ref"+ref+"'>PM</a> - "
+					body += "<a href='?src=\ref[src];adminplayersubtlemessage="+ref+"'>SM</a> - "
+					body += "<a href='?src=\ref[src];adminplayerobservejump="+ref+"'>JMP</a><br>"
+					if(antagonist == 1)
+						body += "<font size='2'><a href='?src=\ref[src];secretsadmin=check_antagonist'><b><font color='red'>Antagonist</font></b></a> with "+karma+" karma</font>";
+					else
+						body += "<font size='2'>"+karma+" karma</font>";
+
+					body += "</td></tr></table>";
+
+
+					span.innerHTML = body
+				}
+
+				function clearAll(){
+					var spans = document.getElementsByTagName('span');
+					for(var i = 0; i < spans.length; i++){
+						var span = spans\[i\];
+
+						var id = span.getAttribute("id");
+
+						if(!(id.indexOf("item")==0))
+							continue;
+
+						var pass = 1;
+
+						for(var j = 0; j < locked_tabs.length; j++){
+							if(locked_tabs\[j\]==id){
+								pass = 0;
+								break;
+							}
+						}
+
+						if(pass != 1)
+							continue;
+
+
+
+
+						span.innerHTML = "";
+					}
+				}
+
+				function addToLocked(id,link_id,notice_span_id){
+					var link = document.getElementById(link_id);
+					var decision = link.getAttribute("name");
+					if(decision == "1"){
+						link.setAttribute("name","2");
+					}else{
+						link.setAttribute("name","1");
+						removeFromLocked(id,link_id,notice_span_id);
+						return;
+					}
+
+					var pass = 1;
+					for(var j = 0; j < locked_tabs.length; j++){
+						if(locked_tabs\[j\]==id){
+							pass = 0;
+							break;
+						}
+					}
+					if(!pass)
+						return;
+					locked_tabs.push(id);
+					var notice_span = document.getElementById(notice_span_id);
+					notice_span.innerHTML = "<font color='red'>Locked</font> ";
+					//link.setAttribute("onClick","attempt('"+id+"','"+link_id+"','"+notice_span_id+"');");
+					//document.write("removeFromLocked('"+id+"','"+link_id+"','"+notice_span_id+"')");
+					//document.write("aa - "+link.getAttribute("onClick"));
+				}
+
+				function attempt(ab){
+					return ab;
+				}
+
+				function removeFromLocked(id,link_id,notice_span_id){
+					//document.write("a");
+					var index = 0;
+					var pass = 0;
+					for(var j = 0; j < locked_tabs.length; j++){
+						if(locked_tabs\[j\]==id){
+							pass = 1;
+							index = j;
+							break;
+						}
+					}
+					if(!pass)
+						return;
+					locked_tabs\[index\] = "";
+					var notice_span = document.getElementById(notice_span_id);
+					notice_span.innerHTML = "";
+					//var link = document.getElementById(link_id);
+					//link.setAttribute("onClick","addToLocked('"+id+"','"+link_id+"','"+notice_span_id+"')");
+				}
+
+				function selectTextField(){
+					var filter_text = document.getElementById('filter');
+					filter_text.focus();
+					filter_text.select();
+				}
+
+			</script>
+		</head>
+
+
+	"}
+
+	//body tag start + onload and onkeypress (onkeyup) javascript event calls
+	dat += "<body onload='selectTextField(); updateSearch();' onkeyup='updateSearch();'>"
+
+	//title + search bar
+	dat += {"
+
+		<table width='560' align='center' cellspacing='0' cellpadding='5' id='maintable'>
+			<tr id='title_tr'>
+				<td align='center'>
+					<font size='5'><b>Player panel</b></font><br>
+					Hover over a line to see more information
+					<p>
+				</td>
+			</tr>
+			<tr id='search_tr'>
+				<td align='center'>
+					<b>Search:</b> <input type='text' id='filter' value='' style='width:300px;'>
+				</td>
+			</tr>
+	</table>
+
+	"}
+
+	//player table header
+	dat += {"
+		<span id='maintable_data_archive'>
+		<table width='560' align='center' cellspacing='0' cellpadding='5' id='maintable_data'>"}
+
 	var/list/mobs = sortmobs()
+	var/i = 1
 	var/show_karma = 0
 	var/DBConnection/dbcon
-
 	if(config.sql_enabled) // SQL is enabled in config.txt
 		dbcon = new() // Setting up connection
 		dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]")
@@ -1842,104 +2048,82 @@
 		else
 			usr << "\red Unable to connect to karma database. This error can occur if your host has failed to set up an SQL database or improperly configured its login credentials.<br>"
 
-	if(!show_karma)
-		for(var/mob/M in mobs)
-			if(M.ckey)
-				dat += "<tr><td>[M.name]</td>" // Adds current name
-				if(istype(M, /mob/living/silicon/ai))    // Adds current 'Real Name'
-					dat += "<td>AI</td>"
-				if(istype(M, /mob/living/silicon/robot))
-					dat += "<td>Cyborg</td>"
-				if(istype(M, /mob/living/carbon/human))
-					dat += "<td>[M.real_name]</td>"
-				if(istype(M, /mob/living/silicon/pai))
-					dat += "<td>pAI</td>"
-				if(istype(M, /mob/new_player))
-					dat += "<td>New Player</td>"
-				if(istype(M, /mob/dead/observer))
-					dat += "<td>Ghost</td>"
-				if(istype(M, /mob/living/carbon/monkey))
-					dat += "<td>Monkey</td>"
-				if(istype(M, /mob/living/carbon/alien))
-					dat += "<td>Alien</td>"
+	for(var/mob/M in mobs)
+		if(M.ckey)
 
-				if(M.mind && M.mind.assigned_role)								// Adds a column to Player Panel that shows their current job.
-					var/mob/living/carbon/human/H = M
-					if (H.wear_id)
-						var/obj/item/weapon/card/id/id = H.wear_id
-						if(M.mind.assigned_role == id.assignment)			// Polymorph
-							dat += "<td>[M.mind.assigned_role]</td>"
-						else
-							dat += "<td>[M.mind.assigned_role] ([id.assignment])"
-					else
-						dat += "<td>[M.mind.assigned_role] (No ID)</td>"
-				else
-					dat += "<td>No Assigned Role</td>"
+			var/color = "#e6e6e6"
+			if(i%2 == 0)
+				color = "#f2f2f2"
+			var/is_antagonist = is_special_character(M)
 
-				dat += {"<td>[M.client?"[M.client]":"No client"]</td>
-				<td align=center><A HREF='?src=\ref[src];adminplayeropts=\ref[M]'>X</A></td>
-				<td align=center><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td>
-				"}
-				switch(is_special_character(M))
-					if(0)
-						dat += {"<td align=center><A HREF='?src=\ref[src];traitor=\ref[M]'>Traitor?</A></td>"}
-					if(1)
-						dat += {"<td align=center><A HREF='?src=\ref[src];traitor=\ref[M]'><font color=red>Traitor?</font></A></td>"}
-					if(2)
-						dat += {"<td align=center><A HREF='?src=\ref[src];traitor=\ref[M]'><font color=red><b>Traitor?</b></font></A></td>"}
-				if (config.sql_enabled)
-					dat += "<td><font color=red>ERROR</font></td></tr>"
-				else
-					dat += "<td>disabled</td></tr>"
-
-	else
-
-		for(var/mob/M in mobs)
-			if(M.ckey)
+			var/karma = "DC"
 
+			if(show_karma)
 				var/DBQuery/query = dbcon.NewQuery("SELECT karma FROM karmatotals WHERE byondkey='[M.key]'")
 				query.Execute()
 
-				var/currentkarma
 				while(query.NextRow())
-					currentkarma = query.item[1]
+					karma = query.item[1]
 
-				dat += "<tr><td>[M.name]</td>"
-				if(isAI(M))
-					dat += "<td>AI</td>"
-				if(isrobot(M))
-					dat += "<td>Cyborg</td>"
-				if(ishuman(M))
-					dat += "<td>[M.real_name]</td>"
-				if(istype(M, /mob/living/silicon/pai))
-					dat += "<td>pAI</td>"
-				if(istype(M, /mob/new_player))
-					dat += "<td>New Player</td>"
-				if(isobserver(M))
-					dat += "<td>Ghost</td>"
-				if(ismonkey(M))
-					dat += "<td>Monkey</td>"
-				if(isalien(M))
-					dat += "<td>Alien</td>"
-				dat += {"<td>[(M.client ? "[M.client]" : "No client")]</td>
-				<td align=center><A HREF='?src=\ref[src];adminplayeropts=\ref[M]'>X</A></td>
-				<td align=center><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td>
-				"}
-				switch(is_special_character(M))
-					if(0)
-						dat += {"<td align=center><A HREF='?src=\ref[src];traitor=\ref[M]'>Traitor?</A></td>"}
-					if(1)
-						dat += {"<td align=center><A HREF='?src=\ref[src];traitor=\ref[M]'><font color=red>Traitor?</font></A></td>"}
-					if(2)
-						dat += {"<td align=center><A HREF='?src=\ref[src];traitor=\ref[M]'><font color=red><b>Traitor?</b></font></A></td>"}
-				if(currentkarma)
-					dat += "<td>[currentkarma]</td></tr>"
-				else
-					dat += "<td>0</td></tr>"
+			var/job = ""
 
-	dat += "</table></body></html>"
+			if(isobserver(M))
+				job = "Ghost"
+			if(isalien(M))
+				job = "Alien"
+			if(islarva(M))
+				job = "Alien larva"
+			if(ishuman(M))
+				job = M.job
+			if(ismetroid(M))
+				job = "Metroid"
+			if(ismonkey(M))
+				job = "Moneky"
+			if(isAI(M))
+				job = "AI"
+			if(ispAI(M))
+				job = "pAI"
+			if(isrobot(M))
+				job = "Cyborg"
+			if(isanimal(M))
+				job = "Animal"
+			if(iscorgi(M))
+				job = "Corgi"
 
-	usr << browse(dat, "window=players;size=540x480")
+			//output for each mob
+			dat += {"
+
+				<tr id='data[i]' name='[i]' onClick="addToLocked('item[i]','data[i]','notice_span[i]')">
+					<td align='center' bgcolor='[color]'>
+						<span id='notice_span[i]'></span>
+						<a id='link[i]'
+						onmouseover='expand("item[i]","[job]","[M.name]","[M.real_name]","--unused--","[M.key]","[M.lastKnownIP]",[is_antagonist],"[karma]","\ref[M]")'
+						>
+						<b id='search[i]'>[M.name] - [M.real_name] - [M.key]</b>
+						</a>
+						<br><span id='item[i]'></span>
+					</td>
+				</tr>
+
+			"}
+
+			i++
+
+
+	//player table ending
+	dat += {"
+		</table>
+		</span>
+
+		<script type='text/javascript'>
+			var maintable = document.getElementById("maintable_data_archive");
+			var complete_list = maintable.innerHTML;
+		</script>
+	</body></html>
+	"}
+
+	text2file(dat, "debug.html")
+	usr << browse(dat, "window=players;size=600x480")
 
 
 /obj/admins/proc/Jobbans()
