diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index ddbee4c06a9..da42cc740ca 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -1,4 +1,9 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
+#define MED_DATA_MAIN	1	// Main menu
+#define MED_DATA_R_LIST	2	// Record list
+#define MED_DATA_MAINT	3	// Records maintenance
+#define MED_DATA_RECORD	4	// Record
+#define MED_DATA_V_DATA	5	// Virus database
+#define MED_DATA_MEDBOT	6	// Medbot monitor
 
 /obj/machinery/computer/med_data//TODO:SANITY
 	name = "medical records console"
@@ -13,486 +18,516 @@
 	var/screen = null
 	var/datum/data/record/active1 = null
 	var/datum/data/record/active2 = null
-	var/a_id = null
 	var/temp = null
 	var/printing = null
 
 	light_color = LIGHT_COLOR_DARKBLUE
 
-/obj/machinery/computer/med_data/attack_ai(user as mob)
-	return src.attack_hand(user)
+/obj/machinery/computer/med_data/attackby(obj/item/O, mob/user, params)
+	if(istype(O, /obj/item/weapon/card/id) && !scan)
+		usr.drop_item()
+		O.forceMove(src)
+		scan = O
+		ui_interact(user)
+	..()
 
-
-/obj/machinery/computer/med_data/attack_hand(mob/user as mob)
+/obj/machinery/computer/med_data/attack_hand(mob/user)
 	if(..())
 		return
-	var/dat
-	if(src.temp)
-		dat = text("<TT>[src.temp]</TT><BR><BR><A href='?src=[UID()];temp=1'>Clear Screen</A>")
-	else
-		dat = text("Confirm Identity: <A href='?src=[UID()];scan=1'>[]</A><HR>", (src.scan ? text("[]", src.scan.name) : "----------"))
-		if(src.authenticated)
-			switch(src.screen)
-				if(1.0)
-					dat += {"
-<A href='?src=[UID()];search=1'>Search Records</A>
-<BR><A href='?src=[UID()];screen=2'>List Records</A>
-<BR>
-<BR><A href='?src=[UID()];screen=5'>Virus Database</A>
-<BR><A href='?src=[UID()];screen=6'>Medbot Tracking</A>
-<BR>
-<BR><A href='?src=[UID()];screen=3'>Record Maintenance</A>
-<BR><A href='?src=[UID()];logout=1'>{Log Out}</A><BR>
-"}
-				if(2.0)
-					dat += "<B>Record List</B>:<HR>"
-					if(!isnull(data_core.general))
-						for(var/datum/data/record/R in sortRecord(data_core.general))
-							dat += text("<A href='?src=[UID()];d_rec=\ref[]'>[]: []</A><BR>", R, R.fields["id"], R.fields["name"])
-							//Foreach goto(132)
-					dat += "<HR><A href='?src=[UID()];screen=1'>Back</A>"
-				if(3.0)
-					dat += "<B>Records Maintenance</B><HR>\n<A href='?src=[UID()];back=1'>Backup To Disk</A><BR>\n<A href='?src=[UID()];u_load=1'>Upload From disk</A><BR>\n<A href='?src=[UID()];del_all=1'>Delete All Records</A><BR>\n<BR>\n<A href='?src=[UID()];screen=1'>Back</A>"
-				if(4.0)
-					dat += "<CENTER><B>Medical Record</B></CENTER><BR>"
-					if((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1)))
-						dat += "<table><tr><td>Name: [active1.fields["name"]] \
-								ID: [active1.fields["id"]]<BR>\n	\
-								Sex: <A href='?src=[UID()];field=sex'>[active1.fields["sex"]]</A><BR>\n	\
-								Age: <A href='?src=[UID()];field=age'>[active1.fields["age"]]</A><BR>\n	\
-								Fingerprint: <A href='?src=[UID()];field=fingerprint'>[active1.fields["fingerprint"]]</A><BR>\n	\
-								Physical Status: <A href='?src=[UID()];field=p_stat'>[active1.fields["p_stat"]]</A><BR>\n	\
-								Mental Status: <A href='?src=[UID()];field=m_stat'>[active1.fields["m_stat"]]</A><BR></td><td align = center valign = top> \
-								Photo:<br><img src=[active1.fields["photo-south"]] height=64 width=64 border=5> \
-								<img src=[active1.fields["photo-west"]] height=64 width=64 border=5></td></tr></table>"
-					else
-						dat += "<B>General Record Lost!</B><BR>"
-					if((istype(src.active2, /datum/data/record) && data_core.medical.Find(src.active2)))
-						dat += text("<BR>\n<CENTER><B>Medical Data</B></CENTER><BR>\nBlood Type: <A href='?src=[UID()];field=b_type'>[]</A><BR>\nDNA: <A href='?src=[UID()];field=b_dna'>[]</A><BR>\n<BR>\nMinor Disabilities: <A href='?src=[UID()];field=mi_dis'>[]</A><BR>\nDetails: <A href='?src=[UID()];field=mi_dis_d'>[]</A><BR>\n<BR>\nMajor Disabilities: <A href='?src=[UID()];field=ma_dis'>[]</A><BR>\nDetails: <A href='?src=[UID()];field=ma_dis_d'>[]</A><BR>\n<BR>\nAllergies: <A href='?src=[UID()];field=alg'>[]</A><BR>\nDetails: <A href='?src=[UID()];field=alg_d'>[]</A><BR>\n<BR>\nCurrent Diseases: <A href='?src=[UID()];field=cdi'>[]</A> (per disease info placed in log/comment section)<BR>\nDetails: <A href='?src=[UID()];field=cdi_d'>[]</A><BR>\n<BR>\nImportant Notes:<BR>\n\t<A href='?src=[UID()];field=notes'>[]</A><BR>\n<BR>\n<CENTER><B>Comments/Log</B></CENTER><BR>", src.active2.fields["b_type"], src.active2.fields["b_dna"], src.active2.fields["mi_dis"], src.active2.fields["mi_dis_d"], src.active2.fields["ma_dis"], src.active2.fields["ma_dis_d"], src.active2.fields["alg"], src.active2.fields["alg_d"], src.active2.fields["cdi"], src.active2.fields["cdi_d"], src.active2.fields["notes"])
-						var/counter = 1
-						while(src.active2.fields[text("com_[]", counter)])
-							dat += text("[]<BR><A href='?src=[UID()];del_c=[]'>Delete Entry</A><BR><BR>", src.active2.fields[text("com_[]", counter)], counter)
-							counter++
-						dat += "<A href='?src=[UID()];add_c=1'>Add Entry</A><BR><BR>"
-						dat += "<A href='?src=[UID()];del_r=1'>Delete Record (Medical Only)</A><BR><BR>"
-					else
-						dat += "<B>Medical Record Lost!</B><BR>"
-						dat += text("<A href='?src=[UID()];new=1'>New Record</A><BR><BR>")
-					dat += "\n<A href='?src=[UID()];print_p=1'>Print Record</A><BR>\n<A href='?src=[UID()];screen=2'>Back</A><BR>"
-				if(5.0)
-					dat += "<CENTER><B>Virus Database</B></CENTER>"
-					for(var/Dt in typesof(/datum/disease/))
-						var/datum/disease/Dis = new Dt(0)
-						if(istype(Dis, /datum/disease/advance))
-							continue // TODO (tm): Add advance diseases to the virus database which no one uses.
-						if(!Dis.desc)
-							continue
-						dat += "<br><a href='?src=[UID()];vir=[Dt]'>[Dis.name]</a>"
-					dat += "<br><a href='?src=[UID()];screen=1'>Back</a>"
-				if(6.0)
-					dat += "<center><b>Medical Robot Monitor</b></center>"
-					dat += "<a href='?src=[UID()];screen=1'>Back</a>"
-					dat += "<br><b>Medical Robots:</b>"
-					var/bdat = null
-					for(var/mob/living/simple_animal/bot/medbot/M in world)
+	if(is_away_level(z))
+		to_chat(user, "<span class='danger'>Unable to establish a connection</span>: You're too far away from the station!")
+		return
+	add_fingerprint(user)
+	ui_interact(user)
 
-						if(M.z != src.z)	continue	//only find medibots on the same z-level as the computer
-						var/turf/bl = get_turf(M)
-						if(bl)	//if it can't find a turf for the medibot, then it probably shouldn't be showing up
-							bdat += "[M.name] - <b>\[[bl.x],[bl.y]\]</b> - [M.on ? "Online" : "Offline"]<br>"
-							if((!isnull(M.reagent_glass)) && M.use_beaker)
-								bdat += "Reservoir: \[[M.reagent_glass.reagents.total_volume]/[M.reagent_glass.reagents.maximum_volume]\]<br>"
-							else
-								bdat += "Using Internal Synthesizer.<br>"
-					if(!bdat)
-						dat += "<br><center>None detected</center>"
-					else
-						dat += "<br>[bdat]"
+/obj/machinery/computer/med_data/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "med_data.tmpl", name, 800, 380)
+		ui.open()
 
+/obj/machinery/computer/med_data/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
+	var/data[0]
+	data["temp"] = temp
+	data["scan"] = scan ? scan.name : null
+	data["authenticated"] = authenticated
+	data["screen"] = screen
+	if(authenticated)
+		switch(screen)
+			if(MED_DATA_R_LIST)
+				if(!isnull(data_core.general))
+					var/list/records = list()
+					data["records"] = records
+					for(var/datum/data/record/R in sortRecord(data_core.general))
+						records[++records.len] = list("ref" = "\ref[R]", "id" = R.fields["id"], "name" = R.fields["name"])
+			if(MED_DATA_RECORD)
+				var/list/general = list()
+				data["general"] = general
+				if(istype(active1, /datum/data/record) && data_core.general.Find(active1))
+					var/list/fields = list()
+					general["fields"] = fields
+					fields[++fields.len] = list("field" = "Name:", "value" = active1.fields["name"], "edit" = null)
+					fields[++fields.len] = list("field" = "ID:", "value" = active1.fields["id"], "edit" = null)
+					fields[++fields.len] = list("field" = "Sex:", "value" = active1.fields["sex"], "edit" = "sex")
+					fields[++fields.len] = list("field" = "Age:", "value" = active1.fields["age"], "edit" = "age")
+					fields[++fields.len] = list("field" = "Fingerprint:", "value" = active1.fields["fingerprint"], "edit" = "fingerprint")
+					fields[++fields.len] = list("field" = "Physical Status:", "value" = active1.fields["p_stat"], "edit" = "p_stat")
+					fields[++fields.len] = list("field" = "Mental Status:", "value" = active1.fields["m_stat"], "edit" = "m_stat")
+					var/list/photos = list()
+					general["photos"] = photos
+					photos[++photos.len] = list("photo" = active1.fields["photo-south"])
+					photos[++photos.len] = list("photo" = active1.fields["photo-west"])
+					general["has_photos"] = (active1.fields["photo-south"] || active1.fields["photo-west"] ? 1 : 0)
+					general["empty"] = 0
 				else
-		else
-			dat += "<A href='?src=[UID()];login=1'>{Log In}</A>"
-	var/datum/browser/popup = new(user, "med_rec", name, 400, 400)
-	popup.set_content(dat)
-	popup.open(0)
-	onclose(user, "med_rec")
-	return
+					general["empty"] = 1
+
+				var/list/medical = list()
+				data["medical"] = medical
+				if(istype(active2, /datum/data/record) && data_core.medical.Find(active2))
+					var/list/fields = list()
+					medical["fields"] = fields
+					fields[++fields.len] = list("field" = "Blood Type:", "value" = active2.fields["b_type"], "edit" = "b_type", "line_break" = 0)
+					fields[++fields.len] = list("field" = "DNA:", "value" = active2.fields["b_dna"], "edit" = "b_dna", "line_break" = 1)
+					fields[++fields.len] = list("field" = "Minor Disabilities:", "value" = active2.fields["mi_dis"], "edit" = "mi_dis", "line_break" = 0)
+					fields[++fields.len] = list("field" = "Details:", "value" = active2.fields["mi_dis_d"], "edit" = "mi_dis_d", "line_break" = 1)
+					fields[++fields.len] = list("field" = "Major Disabilities:", "value" = active2.fields["ma_dis"], "edit" = "ma_dis", "line_break" = 0)
+					fields[++fields.len] = list("field" = "Details:", "value" = active2.fields["ma_dis_d"], "edit" = "ma_dis_d", "line_break" = 1)
+					fields[++fields.len] = list("field" = "Allergies:", "value" = active2.fields["alg"], "edit" = "alg", "line_break" = 0)
+					fields[++fields.len] = list("field" = "Details:", "value" = active2.fields["alg_d"], "edit" = "alg_d", "line_break" = 1)
+					fields[++fields.len] = list("field" = "Current Diseases:", "value" = active2.fields["cdi"], "edit" = "cdi", "line_break" = 0)
+					fields[++fields.len] = list("field" = "Details:", "value" = active2.fields["cdi_d"], "edit" = "cdi_d", "line_break" = 1)
+					fields[++fields.len] = list("field" = "Important Notes:", "value" = active2.fields["notes"], "edit" = "notes", "line_break" = 0)
+					if(!active2.fields["comments"] || !islist(active2.fields["comments"]))
+						active2.fields["comments"] = list()
+					medical["comments"] = active2.fields["comments"]
+					medical["empty"] = 0
+				else
+					medical["empty"] = 1
+			if(MED_DATA_V_DATA)
+				data["virus"] = list()
+				for(var/D in typesof(/datum/disease))
+					var/datum/disease/DS = new D(0)
+					if(istype(DS, /datum/disease/advance))
+						continue
+					if(!DS.desc)
+						continue
+					data["virus"] += list(list("name" = DS.name, "D" = D))
+			if(MED_DATA_MEDBOT)
+				data["medbots"] = list()
+				for(var/mob/living/simple_animal/bot/medbot/M in world)
+					if(M.z != z)
+						continue
+					var/turf/T = get_turf(M)
+					if(T)
+						var/medbot = list()
+						medbot["name"] = M.name
+						medbot["x"] = T.x
+						medbot["y"] = T.y
+						medbot["on"] = M.on
+						if(!isnull(M.reagent_glass) && M.use_beaker)
+							medbot["use_beaker"] = 1
+							medbot["total_volume"] = M.reagent_glass.reagents.total_volume
+							medbot["maximum_volume"] = M.reagent_glass.reagents.maximum_volume
+						else
+							medbot["use_beaker"] = 0
+						data["medbots"] += list(medbot)
+	return data
 
 /obj/machinery/computer/med_data/Topic(href, href_list)
 	if(..())
 		return 1
 
-	if(!( data_core.general.Find(src.active1) ))
-		src.active1 = null
+	if(!data_core.general.Find(active1))
+		active1 = null
+	if(!data_core.medical.Find(active2))
+		active2 = null
 
-	if(!( data_core.medical.Find(src.active2) ))
-		src.active2 = null
+	if(href_list["temp"])
+		temp = null
 
-	if((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
-		usr.set_machine(src)
+	if(href_list["temp_action"])
+		if(href_list["temp_action"])
+			var/temp_href = splittext(href_list["temp_action"], "=")
+			switch(temp_href[1])
+				if("del_all2")
+					for(var/datum/data/record/R in data_core.medical)
+						qdel(R)
+					temp = list("text" = "All records deleted.", "buttons" = list())
+				if("p_stat")
+					if(active1)
+						switch(temp_href[2])
+							if("deceased")
+								active1.fields["p_stat"] = "*Deceased*"
+							if("ssd")
+								active1.fields["p_stat"] = "*SSD*"
+							if("active")
+								active1.fields["p_stat"] = "Active"
+							if("unfit")
+								active1.fields["p_stat"] = "Physically Unfit"
+							if("disabled")
+								active1.fields["p_stat"] = "Disabled"
+				if("m_stat")
+					if(active1)
+						switch(temp_href[2])
+							if("insane")
+								active1.fields["m_stat"] = "*Insane*"
+							if("unstable")
+								active1.fields["m_stat"] = "*Unstable*"
+							if("watch")
+								active1.fields["m_stat"] = "*Watch*"
+							if("stable")
+								active1.fields["m_stat"] = "Stable"
+				if("b_type")
+					if(active2)
+						switch(temp_href[2])
+							if("an")
+								active2.fields["b_type"] = "A-"
+							if("bn")
+								active2.fields["b_type"] = "B-"
+							if("abn")
+								active2.fields["b_type"] = "AB-"
+							if("on")
+								active2.fields["b_type"] = "O-"
+							if("ap")
+								active2.fields["b_type"] = "A+"
+							if("bp")
+								active2.fields["b_type"] = "B+"
+							if("abp")
+								active2.fields["b_type"] = "AB+"
+							if("op")
+								active2.fields["b_type"] = "O+"
+				if("del_r2")
+					if(active2)
+						qdel(active2)
+						active2 = null
 
-		if(href_list["temp"])
-			src.temp = null
+	if(href_list["scan"])
+		if(scan)
+			scan.forceMove(loc)
+			if(ishuman(usr) && !usr.get_active_hand())
+				usr.put_in_hands(scan)
+			scan = null
+		else
+			var/obj/item/I = usr.get_active_hand()
+			if(istype(I, /obj/item/weapon/card/id))
+				usr.drop_item()
+				I.forceMove(src)
+				scan = I
 
-		if(href_list["scan"])
-			if(src.scan)
+	if(href_list["login"])
+		if(isAI(usr))
+			authenticated = usr.name
+			rank = "AI"
+		else if(isrobot(usr))
+			authenticated = usr.name
+			var/mob/living/silicon/robot/R = usr
+			rank = "[R.modtype] [R.braintype]"
+		else if(istype(scan, /obj/item/weapon/card/id))
+			if(check_access(scan))
+				authenticated = scan.registered_name
+				rank = scan.assignment
 
-				if(ishuman(usr))
-					scan.loc = usr.loc
+		if(authenticated)
+			active1 = null
+			active2 = null
+			screen = MED_DATA_MAIN
 
-					if(!usr.get_active_hand())
-						usr.put_in_hands(scan)
+	if(authenticated)
+		var/incapable = (usr.stat || usr.restrained() || (!in_range(src, usr) && !issilicon(usr)))
+		if(href_list["logout"])
+			authenticated = null
+			screen = null
+			active1 = null
+			active2 = null
 
-					scan = null
+		if(href_list["screen"])
+			screen = text2num(href_list["screen"])
+			if(screen < 1)
+				screen = MED_DATA_MAIN
 
-				else
-					src.scan.loc = src.loc
-					src.scan = null
+			active1 = null
+			active2 = null
 
-			else
-				var/obj/item/I = usr.get_active_hand()
-				if(istype(I, /obj/item/weapon/card/id))
-					usr.drop_item()
-					I.loc = src
-					src.scan = I
+		if(href_list["vir"])
+			var/type = href_list["vir"]
+			var/datum/disease/D = new type(0)
+			var/afs = ""
+			for(var/mob/M in D.viable_mobtypes)
+				afs += "[initial(M.name)];"
+			var/severity = D.severity
+			switch(severity)
+				if("Harmful", "Minor")
+					severity = "<span class='good'>[severity]</span>"
+				if("Medium")
+					severity = "<span class='average'>[severity]</span>"
+				if("Dangerous!")
+					severity = "<span class='bad'>[severity]</span>"
+				if("BIOHAZARD THREAT!")
+					severity = "<h4><span class='bad'>[severity]</span></h4>"
+			setTemp({"<b>Name:</b> [D.name]
+					<BR><b>Number of stages:</b> [D.max_stages]
+					<BR><b>Spread:</b> [D.spread_text] Transmission
+					<BR><b>Possible Cure:</b> [(D.cure_text||"none")]
+					<BR><b>Affected Lifeforms:</b>[afs]<BR>
+					<BR><b>Notes:</b> [D.desc]<BR>
+					<BR><b>Severity:</b> [severity]"})
+			qdel(D)
 
-		else if(href_list["logout"])
-			src.authenticated = null
-			src.screen = null
-			src.active1 = null
-			src.active2 = null
+		if(href_list["del_all"])
+			var/list/buttons = list()
+			buttons[++buttons.len] = list("name" = "Yes", "icon" = "check", "href" = "del_all2=1")
+			buttons[++buttons.len] = list("name" = "No", "icon" = "times", "href" = null)
+			setTemp("<h3>Are you sure you wish to delete all records?</h3>", buttons)
 
-		else if(href_list["login"])
-
-			if(istype(usr, /mob/living/silicon/ai))
-				src.active1 = null
-				src.active2 = null
-				src.authenticated = usr.name
-				src.rank = "AI"
-				src.screen = 1
-
-			else if(istype(usr, /mob/living/silicon/robot))
-				src.active1 = null
-				src.active2 = null
-				src.authenticated = usr.name
-				var/mob/living/silicon/robot/R = usr
-				src.rank = "[R.modtype] [R.braintype]"
-				src.screen = 1
-
-			else if(istype(src.scan, /obj/item/weapon/card/id))
-				src.active1 = null
-				src.active2 = null
-
-				if(src.check_access(src.scan))
-					src.authenticated = src.scan.registered_name
-					src.rank = src.scan.assignment
-					src.screen = 1
-
-		if(src.authenticated)
-
-			if(href_list["screen"])
-				src.screen = text2num(href_list["screen"])
-				if(src.screen < 1)
-					src.screen = 1
-
-				src.active1 = null
-				src.active2 = null
-
-			if(href_list["vir"])
-				var/type = href_list["vir"]
-				var/datum/disease/Dis = new type(0)
-				var/AfS = ""
-				for(var/mob/M in Dis.viable_mobtypes)
-					AfS += " [initial(M.name)];"
-				src.temp = {"<b>Name:</b> [Dis.name]
-<BR><b>Number of stages:</b> [Dis.max_stages]
-<BR><b>Spread:</b> [Dis.spread_text] Transmission
-<BR><b>Possible Cure:</b> [(Dis.cure_text||"none")]
-<BR><b>Affected Lifeforms:</b>[AfS]
-<BR>
-<BR><b>Notes:</b> [Dis.desc]
-<BR>
-<BR><b>Severity:</b> [Dis.severity]"}
-
-			if(href_list["del_all"])
-				src.temp = "Are you sure you wish to delete all records?<br>\n\t<A href='?src=[UID()];temp=1;del_all2=1'>Yes</A><br>\n\t<A href='?src=[UID()];temp=1'>No</A><br>"
-
-			if(href_list["del_all2"])
-				for(var/datum/data/record/R in data_core.medical)
-					//R = null
-					qdel(R)
-					//Foreach goto(494)
-				src.temp = "All records deleted."
-
-			if(href_list["field"])
-				var/a1 = src.active1
-				var/a2 = src.active2
-				switch(href_list["field"])
-					if("fingerprint")
-						if(istype(src.active1, /datum/data/record))
-							var/t1 = copytext(trim(sanitize(input("Please input fingerprint hash:", "Med. records", src.active1.fields["fingerprint"], null)  as text)),1,MAX_MESSAGE_LEN)
-							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
-								return
-							src.active1.fields["fingerprint"] = t1
-					if("sex")
-						if(istype(src.active1, /datum/data/record))
-							if(src.active1.fields["sex"] == "Male")
-								src.active1.fields["sex"] = "Female"
-							else
-								src.active1.fields["sex"] = "Male"
-					if("age")
-						if(istype(src.active1, /datum/data/record))
-							var/t1 = input("Please input age:", "Med. records", src.active1.fields["age"], null)  as num
-							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
-								return
-							src.active1.fields["age"] = t1
-					if("mi_dis")
-						if(istype(src.active2, /datum/data/record))
-							var/t1 = copytext(trim(sanitize(input("Please input minor disabilities list:", "Med. records", src.active2.fields["mi_dis"], null)  as text)),1,MAX_MESSAGE_LEN)
-							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
-								return
-							src.active2.fields["mi_dis"] = t1
-					if("mi_dis_d")
-						if(istype(src.active2, /datum/data/record))
-							var/t1 = copytext(trim(sanitize(input("Please summarize minor dis.:", "Med. records", src.active2.fields["mi_dis_d"], null)  as message)),1,MAX_MESSAGE_LEN)
-							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
-								return
-							src.active2.fields["mi_dis_d"] = t1
-					if("ma_dis")
-						if(istype(src.active2, /datum/data/record))
-							var/t1 = copytext(trim(sanitize(input("Please input major diabilities list:", "Med. records", src.active2.fields["ma_dis"], null)  as text)),1,MAX_MESSAGE_LEN)
-							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
-								return
-							src.active2.fields["ma_dis"] = t1
-					if("ma_dis_d")
-						if(istype(src.active2, /datum/data/record))
-							var/t1 = copytext(trim(sanitize(input("Please summarize major dis.:", "Med. records", src.active2.fields["ma_dis_d"], null)  as message)),1,MAX_MESSAGE_LEN)
-							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
-								return
-							src.active2.fields["ma_dis_d"] = t1
-					if("alg")
-						if(istype(src.active2, /datum/data/record))
-							var/t1 = copytext(trim(sanitize(input("Please state allergies:", "Med. records", src.active2.fields["alg"], null)  as text)),1,MAX_MESSAGE_LEN)
-							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
-								return
-							src.active2.fields["alg"] = t1
-					if("alg_d")
-						if(istype(src.active2, /datum/data/record))
-							var/t1 = copytext(trim(sanitize(input("Please summarize allergies:", "Med. records", src.active2.fields["alg_d"], null)  as message)),1,MAX_MESSAGE_LEN)
-							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
-								return
-							src.active2.fields["alg_d"] = t1
-					if("cdi")
-						if(istype(src.active2, /datum/data/record))
-							var/t1 = copytext(trim(sanitize(input("Please state diseases:", "Med. records", src.active2.fields["cdi"], null)  as text)),1,MAX_MESSAGE_LEN)
-							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
-								return
-							src.active2.fields["cdi"] = t1
-					if("cdi_d")
-						if(istype(src.active2, /datum/data/record))
-							var/t1 = copytext(trim(sanitize(input("Please summarize diseases:", "Med. records", src.active2.fields["cdi_d"], null)  as message)),1,MAX_MESSAGE_LEN)
-							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
-								return
-							src.active2.fields["cdi_d"] = t1
-					if("notes")
-						if(istype(src.active2, /datum/data/record))
-							var/t1 = copytext(html_encode(trim(input("Please summarize notes:", "Med. records", html_decode(src.active2.fields["notes"]), null)  as message)),1,MAX_MESSAGE_LEN)
-							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
-								return
-							src.active2.fields["notes"] = t1
-					if("p_stat")
-						if(istype(src.active1, /datum/data/record))
-							src.temp = "<B>Physical Condition:</B><BR>\n\t<A href='?src=[UID()];temp=1;p_stat=deceased'>*Deceased*</A><BR>\n\t<A href='?src=[UID()];temp=1;p_stat=ssd'>*SSD*</A><BR>\n\t<A href='?src=[UID()];temp=1;p_stat=active'>Active</A><BR>\n\t<A href='?src=[UID()];temp=1;p_stat=unfit'>Physically Unfit</A><BR>\n\t<A href='?src=[UID()];temp=1;p_stat=disabled'>Disabled</A><BR>"
-					if("m_stat")
-						if(istype(src.active1, /datum/data/record))
-							src.temp = "<B>Mental Condition:</B><BR>\n\t<A href='?src=[UID()];temp=1;m_stat=insane'>*Insane*</A><BR>\n\t<A href='?src=[UID()];temp=1;m_stat=unstable'>*Unstable*</A><BR>\n\t<A href='?src=[UID()];temp=1;m_stat=watch'>*Watch*</A><BR>\n\t<A href='?src=[UID()];temp=1;m_stat=stable'>Stable</A><BR>"
-					if("b_type")
-						if(istype(src.active2, /datum/data/record))
-							src.temp = "<B>Blood Type:</B><BR>\n\t<A href='?src=[UID()];temp=1;b_type=an'>A-</A> <A href='?src=[UID()];temp=1;b_type=ap'>A+</A><BR>\n\t<A href='?src=[UID()];temp=1;b_type=bn'>B-</A> <A href='?src=[UID()];temp=1;b_type=bp'>B+</A><BR>\n\t<A href='?src=[UID()];temp=1;b_type=abn'>AB-</A> <A href='?src=[UID()];temp=1;b_type=abp'>AB+</A><BR>\n\t<A href='?src=[UID()];temp=1;b_type=on'>O-</A> <A href='?src=[UID()];temp=1;b_type=op'>O+</A><BR>"
-					if("b_dna")
-						if(istype(src.active1, /datum/data/record))
-							var/t1 = copytext(trim(sanitize(input("Please input DNA hash:", "Med. records", src.active1.fields["dna"], null)  as text)),1,MAX_MESSAGE_LEN)
-							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
-								return
-							src.active1.fields["dna"] = t1
-					if("vir_name")
-						var/datum/data/record/v = locate(href_list["edit_vir"])
-						if(v)
-							var/t1 = copytext(trim(sanitize(input("Please input pathogen name:", "VirusDB", v.fields["name"], null)  as text)),1,MAX_MESSAGE_LEN)
-							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
-								return
-							v.fields["name"] = t1
-					if("vir_desc")
-						var/datum/data/record/v = locate(href_list["edit_vir"])
-						if(v)
-							var/t1 = copytext(trim(sanitize(input("Please input information about pathogen:", "VirusDB", v.fields["description"], null)  as message)),1,MAX_MESSAGE_LEN)
-							if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1))
-								return
-							v.fields["description"] = t1
-					else
-
-			if(href_list["p_stat"])
-				if(src.active1)
-					switch(href_list["p_stat"])
-						if("deceased")
-							src.active1.fields["p_stat"] = "*Deceased*"
-						if("ssd")
-							src.active1.fields["p_stat"] = "*SSD*"
-						if("active")
-							src.active1.fields["p_stat"] = "Active"
-						if("unfit")
-							src.active1.fields["p_stat"] = "Physically Unfit"
-						if("disabled")
-							src.active1.fields["p_stat"] = "Disabled"
-
-			if(href_list["m_stat"])
-				if(src.active1)
-					switch(href_list["m_stat"])
-						if("insane")
-							src.active1.fields["m_stat"] = "*Insane*"
-						if("unstable")
-							src.active1.fields["m_stat"] = "*Unstable*"
-						if("watch")
-							src.active1.fields["m_stat"] = "*Watch*"
-						if("stable")
-							src.active1.fields["m_stat"] = "Stable"
-
-
-			if(href_list["b_type"])
-				if(src.active2)
-					switch(href_list["b_type"])
-						if("an")
-							src.active2.fields["b_type"] = "A-"
-						if("bn")
-							src.active2.fields["b_type"] = "B-"
-						if("abn")
-							src.active2.fields["b_type"] = "AB-"
-						if("on")
-							src.active2.fields["b_type"] = "O-"
-						if("ap")
-							src.active2.fields["b_type"] = "A+"
-						if("bp")
-							src.active2.fields["b_type"] = "B+"
-						if("abp")
-							src.active2.fields["b_type"] = "AB+"
-						if("op")
-							src.active2.fields["b_type"] = "O+"
-
-
-			if(href_list["del_r"])
-				if(src.active2)
-					src.temp = "Are you sure you wish to delete the record (Medical Portion Only)?<br>\n\t<A href='?src=[UID()];temp=1;del_r2=1'>Yes</A><br>\n\t<A href='?src=[UID()];temp=1'>No</A><br>"
-
-			if(href_list["del_r2"])
-				if(src.active2)
-					//src.active2 = null
-					qdel(src.active2)
-
-			if(href_list["d_rec"])
-				var/datum/data/record/R = locate(href_list["d_rec"])
-				var/datum/data/record/M = locate(href_list["d_rec"])
-				if(!( data_core.general.Find(R) ))
-					src.temp = "Record Not Found!"
-					return
-				for(var/datum/data/record/E in data_core.medical)
-					if((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
-						M = E
-					else
-						//Foreach continue //goto(2540)
-				src.active1 = R
-				src.active2 = M
-				src.screen = 4
-
-			if(href_list["new"])
-				if((istype(src.active1, /datum/data/record) && !( istype(src.active2, /datum/data/record) )))
-					var/datum/data/record/R = new /datum/data/record(  )
-					R.fields["name"] = src.active1.fields["name"]
-					R.fields["id"] = src.active1.fields["id"]
-					R.name = text("Medical Record #[]", R.fields["id"])
-					R.fields["b_type"] = "Unknown"
-					R.fields["b_dna"] = "Unknown"
-					R.fields["mi_dis"] = "None"
-					R.fields["mi_dis_d"] = "No minor disabilities have been declared."
-					R.fields["ma_dis"] = "None"
-					R.fields["ma_dis_d"] = "No major disabilities have been diagnosed."
-					R.fields["alg"] = "None"
-					R.fields["alg_d"] = "No allergies have been detected in this patient."
-					R.fields["cdi"] = "None"
-					R.fields["cdi_d"] = "No diseases have been diagnosed at the moment."
-					R.fields["notes"] = "No notes."
-					data_core.medical += R
-					src.active2 = R
-					src.screen = 4
-
-			if(href_list["add_c"])
-				if(!( istype(src.active2, /datum/data/record) ))
-					return
-				var/a2 = src.active2
-				var/t1 = copytext(trim(sanitize(input("Add Comment:", "Med. records", null, null)  as message)),1,MAX_MESSAGE_LEN)
-				if((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2))
-					return
-				var/counter = 1
-				while(src.active2.fields[text("com_[]", counter)])
-					counter++
-				src.active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")]<BR>[t1]")
-
-			if(href_list["del_c"])
-				if((istype(src.active2, /datum/data/record) && src.active2.fields[text("com_[]", href_list["del_c"])]))
-					src.active2.fields[text("com_[]", href_list["del_c"])] = "<B>Deleted</B>"
-
-			if(href_list["search"])
-				var/t1 = input("Search String: (Name, DNA, or ID)", "Med. records", null, null)  as text
-				if((!( t1 ) || usr.stat || !( src.authenticated ) || usr.restrained() || ((!in_range(src, usr)) && (!istype(usr, /mob/living/silicon)))))
-					return
-				src.active1 = null
-				src.active2 = null
-				t1 = lowertext(t1)
-				for(var/datum/data/record/R in data_core.medical)
-					if((lowertext(R.fields["name"]) == t1 || t1 == lowertext(R.fields["id"]) || t1 == lowertext(R.fields["b_dna"])))
-						src.active2 = R
-					else
-						//Foreach continue //goto(3229)
-				if(!( src.active2 ))
-					src.temp = text("Could not locate record [].", t1)
-				else
-					for(var/datum/data/record/E in data_core.general)
-						if((E.fields["name"] == src.active2.fields["name"] || E.fields["id"] == src.active2.fields["id"]))
-							src.active1 = E
+		if(href_list["field"])
+			if(incapable)
+				return 1
+			var/a1 = active1
+			var/a2 = active2
+			switch(href_list["field"])
+				if("fingerprint")
+					if(istype(active1, /datum/data/record))
+						var/t1 = copytext(trim(sanitize(input("Please input fingerprint hash:", "Med. records", active1.fields["fingerprint"], null) as text)), 1, MAX_MESSAGE_LEN)
+						if(!t1 || incapable || active1 != a1)
+							return 1
+						active1.fields["fingerprint"] = t1
+				if("sex")
+					if(istype(active1, /datum/data/record))
+						if(active1.fields["sex"] == "Male")
+							active1.fields["sex"] = "Female"
 						else
-							//Foreach continue //goto(3334)
-					src.screen = 4
+							active1.fields["sex"] = "Male"
+				if("age")
+					if(istype(active1, /datum/data/record))
+						var/t1 = input("Please input age:", "Med. records", active1.fields["age"], null) as num
+						if(!t1 || incapable || active1 != a1)
+							return 1
+						active1.fields["age"] = t1
+				if("mi_dis")
+					if(istype(active2, /datum/data/record))
+						var/t1 = copytext(trim(sanitize(input("Please input minor disabilities list:", "Med. records", active2.fields["mi_dis"], null) as text)), 1, MAX_MESSAGE_LEN)
+						if(!t1 || incapable || active2 != a2)
+							return 1
+						active2.fields["mi_dis"] = t1
+				if("mi_dis_d")
+					if(istype(active2, /datum/data/record))
+						var/t1 = copytext(trim(sanitize(input("Please summarize minor dis.:", "Med. records", active2.fields["mi_dis_d"], null) as message)), 1, MAX_MESSAGE_LEN)
+						if(!t1 || incapable || active2 != a2)
+							return 1
+						active2.fields["mi_dis_d"] = t1
+				if("ma_dis")
+					if(istype(active2, /datum/data/record))
+						var/t1 = copytext(trim(sanitize(input("Please input major diabilities list:", "Med. records", active2.fields["ma_dis"], null) as text)), 1, MAX_MESSAGE_LEN)
+						if(!t1 || incapable || active2 != a2)
+							return 1
+						active2.fields["ma_dis"] = t1
+				if("ma_dis_d")
+					if(istype(active2, /datum/data/record))
+						var/t1 = copytext(trim(sanitize(input("Please summarize major dis.:", "Med. records", active2.fields["ma_dis_d"], null) as message)), 1, MAX_MESSAGE_LEN)
+						if(!t1 || incapable || active2 != a2)
+							return 1
+						active2.fields["ma_dis_d"] = t1
+				if("alg")
+					if(istype(active2, /datum/data/record))
+						var/t1 = copytext(trim(sanitize(input("Please state allergies:", "Med. records", active2.fields["alg"], null) as text)), 1, MAX_MESSAGE_LEN)
+						if(!t1 || incapable || active2 != a2)
+							return 1
+						active2.fields["alg"] = t1
+				if("alg_d")
+					if(istype(active2, /datum/data/record))
+						var/t1 = copytext(trim(sanitize(input("Please summarize allergies:", "Med. records", active2.fields["alg_d"], null) as message)), 1, MAX_MESSAGE_LEN)
+						if(!t1 || incapable || active2 != a2)
+							return 1
+						active2.fields["alg_d"] = t1
+				if("cdi")
+					if(istype(active2, /datum/data/record))
+						var/t1 = copytext(trim(sanitize(input("Please state diseases:", "Med. records", active2.fields["cdi"], null) as text)), 1, MAX_MESSAGE_LEN)
+						if(!t1 || incapable || active2 != a2)
+							return 1
+						active2.fields["cdi"] = t1
+				if("cdi_d")
+					if(istype(active2, /datum/data/record))
+						var/t1 = copytext(trim(sanitize(input("Please summarize diseases:", "Med. records", active2.fields["cdi_d"], null) as message)), 1, MAX_MESSAGE_LEN)
+						if(!t1 || incapable || active2 != a2)
+							return 1
+						active2.fields["cdi_d"] = t1
+				if("notes")
+					if(istype(active2, /datum/data/record))
+						var/t1 = copytext(html_encode(trim(input("Please summarize notes:", "Med. records", html_decode(active2.fields["notes"]), null) as message)), 1, MAX_MESSAGE_LEN)
+						if(!t1 || incapable || active2 != a2)
+							return 1
+						active2.fields["notes"] = t1
+				if("p_stat")
+					if(istype(active1, /datum/data/record))
+						var/list/buttons = list()
+						buttons[++buttons.len] = list("name" = "*Deceased*", "icon" = "stethoscope", "href" = "p_stat=deceased", "status" = (active1.fields["p_stat"] == "*Deceased*" ? "selected" : null))
+						buttons[++buttons.len] = list("name" = "*SSD*", "icon" = "stethoscope", "href" = "p_stat=ssd", "status" = (active1.fields["p_stat"] == "*SSD*" ? "selected" : null))
+						buttons[++buttons.len] = list("name" = "Active", "icon" = "stethoscope", "href" = "p_stat=active", "status" = (active1.fields["p_stat"] == "Active" ? "selected" : null))
+						buttons[++buttons.len] = list("name" = "Physically Unfit", "icon" = "stethoscope", "href" = "p_stat=unfit", "status" = (active1.fields["p_stat"] == "Physically Unfit" ? "selected" : null))
+						buttons[++buttons.len] = list("name" = "Disabled", "icon" = "stethoscope", "href" = "p_stat=disabled", "status" = (active1.fields["p_stat"] == "Disabled" ? "selected" : null))
+						setTemp("<h3>Physical Condition</h3>", buttons)
+				if("m_stat")
+					if(istype(active1, /datum/data/record))
+						var/list/buttons = list()
+						buttons[++buttons.len] = list("name" = "*Insane*", "icon" = "stethoscope", "href" = "m_stat=insane", "status" = (active1.fields["m_stat"] == "*Insane*" ? "selected" : null))
+						buttons[++buttons.len] = list("name" = "*Unstable*", "icon" = "stethoscope", "href" = "m_stat=unstable", "status" = (active1.fields["m_stat"] == "*Unstable*" ? "selected" : null))
+						buttons[++buttons.len] = list("name" = "*Watch*", "icon" = "stethoscope", "href" = "m_stat=watch", "status" = (active1.fields["m_stat"] == "*Watch*" ? "selected" : null))
+						buttons[++buttons.len] = list("name" = "Stable", "icon" = "stethoscope", "href" = "m_stat=stable", "status" = (active1.fields["m_stat"] == "Stable" ? "selected" : null))
+						setTemp("<h3>Mental Condition</h3>", buttons)
+				if("b_type")
+					if(istype(active2, /datum/data/record))
+						var/list/buttons = list()
+						buttons[++buttons.len] = list("name" = "A-", "icon" = "tint", "href" = "b_type=an", "status" = (active2.fields["b_type"] == "A-" ? "selected" : null))
+						buttons[++buttons.len] = list("name" = "A+", "icon" = "tint", "href" = "b_type=ap", "status" = (active2.fields["b_type"] == "A+" ? "selected" : null))
+						buttons[++buttons.len] = list("name" = "B-", "icon" = "tint", "href" = "b_type=bn", "status" = (active2.fields["b_type"] == "B-" ? "selected" : null))
+						buttons[++buttons.len] = list("name" = "B+", "icon" = "tint", "href" = "b_type=bp", "status" = (active2.fields["b_type"] == "B+" ? "selected" : null))
+						buttons[++buttons.len] = list("name" = "AB-", "icon" = "tint", "href" = "b_type=abn", "status" = (active2.fields["b_type"] == "AB-" ? "selected" : null))
+						buttons[++buttons.len] = list("name" = "AB+", "icon" = "tint", "href" = "b_type=abp", "status" = (active2.fields["b_type"] == "AB+" ? "selected" : null))
+						buttons[++buttons.len] = list("name" = "O-", "icon" = "tint", "href" = "b_type=on", "status" = (active2.fields["b_type"] == "O-" ? "selected" : null))
+						buttons[++buttons.len] = list("name" = "O+", "icon" = "tint", "href" = "b_type=op", "status" = (active2.fields["b_type"] == "O+" ? "selected" : null))
+						setTemp("<h3>Blood Type</h3>", buttons)
+				if("b_dna")
+					if(istype(active2, /datum/data/record))
+						var/t1 = copytext(trim(sanitize(input("Please input DNA hash:", "Med. records", active2.fields["b_dna"], null) as text)), 1, MAX_MESSAGE_LEN)
+						if(!t1 || incapable || active2 != a2)
+							return 1
+						active2.fields["b_dna"] = t1
+				if("vir_name")
+					var/datum/data/record/v = locate(href_list["edit_vir"])
+					if(v)
+						var/t1 = copytext(trim(sanitize(input("Please input pathogen name:", "VirusDB", v.fields["name"], null)  as text)), 1, MAX_MESSAGE_LEN)
+						if(!t1 || incapable || active1 != a1)
+							return 1
+						v.fields["name"] = t1
+				if("vir_desc")
+					var/datum/data/record/v = locate(href_list["edit_vir"])
+					if(v)
+						var/t1 = copytext(trim(sanitize(input("Please input information about pathogen:", "VirusDB", v.fields["description"], null) as message)), 1, MAX_MESSAGE_LEN)
+						if(!t1 || incapable || active1 != a1)
+							return 1
+						v.fields["description"] = t1
 
-			if(href_list["print_p"])
-				if(!( src.printing ))
-					src.printing = 1
-					playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1)
-					sleep(50)
-					var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( src.loc )
-					P.info = "<CENTER><B>Medical Record</B></CENTER><BR>"
-					if((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1)))
-						P.info += text("Name: [] ID: []<BR>\nSex: []<BR>\nAge: []<BR>\nFingerprint: []<BR>\nPhysical Status: []<BR>\nMental Status: []<BR>", src.active1.fields["name"], src.active1.fields["id"], src.active1.fields["sex"], src.active1.fields["age"], src.active1.fields["fingerprint"], src.active1.fields["p_stat"], src.active1.fields["m_stat"])
-					else
-						P.info += "<B>General Record Lost!</B><BR>"
-					if((istype(src.active2, /datum/data/record) && data_core.medical.Find(src.active2)))
-						P.info += text("<BR>\n<CENTER><B>Medical Data</B></CENTER><BR>\nBlood Type: []<BR>\nDNA: []<BR>\n<BR>\nMinor Disabilities: []<BR>\nDetails: []<BR>\n<BR>\nMajor Disabilities: []<BR>\nDetails: []<BR>\n<BR>\nAllergies: []<BR>\nDetails: []<BR>\n<BR>\nCurrent Diseases: [] (per disease info placed in log/comment section)<BR>\nDetails: []<BR>\n<BR>\nImportant Notes:<BR>\n\t[]<BR>\n<BR>\n<CENTER><B>Comments/Log</B></CENTER><BR>", src.active2.fields["b_type"], src.active2.fields["b_dna"], src.active2.fields["mi_dis"], src.active2.fields["mi_dis_d"], src.active2.fields["ma_dis"], src.active2.fields["ma_dis_d"], src.active2.fields["alg"], src.active2.fields["alg_d"], src.active2.fields["cdi"], src.active2.fields["cdi_d"], src.active2.fields["notes"])
-						var/counter = 1
-						while(src.active2.fields[text("com_[]", counter)])
-							P.info += text("[]<BR>", src.active2.fields[text("com_[]", counter)])
-							counter++
-					else
-						P.info += "<B>Medical Record Lost!</B><BR>"
-					P.info += "</TT>"
-					P.name = "paper- 'Medical Record'"
-					src.printing = null
+		if(href_list["del_r"])
+			if(active2)
+				var/list/buttons = list()
+				buttons[++buttons.len] = list("name" = "Yes", "icon" = "check", "href" = "del_r2=1", "status" = null)
+				buttons[++buttons.len] = list("name" = "No", "icon" = "times", "href" = null, "status" = null)
+				setTemp("<h3>Are you sure you wish to delete the record (Medical Portion Only)?</h3>", buttons)
 
-	src.add_fingerprint(usr)
-	src.updateUsrDialog()
-	return
+		if(href_list["d_rec"])
+			var/datum/data/record/R = locate(href_list["d_rec"])
+			var/datum/data/record/M = locate(href_list["d_rec"])
+			if(!data_core.general.Find(R))
+				temp = list("text" = "<h3><span class='bad'>Record not found!</span></h3>", "buttons" = list())
+				return 1
+			for(var/datum/data/record/E in data_core.medical)
+				if(E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"])
+					M = E
+			active1 = R
+			active2 = M
+			screen = MED_DATA_RECORD
+
+		if(href_list["new"])
+			if(istype(active1, /datum/data/record) && !istype(active2, /datum/data/record))
+				var/datum/data/record/R = new /datum/data/record()
+				R.fields["name"] = active1.fields["name"]
+				R.fields["id"] = active1.fields["id"]
+				R.name = "Medical Record #[R.fields["id"]]"
+				R.fields["b_type"] = "Unknown"
+				R.fields["b_dna"] = "Unknown"
+				R.fields["mi_dis"] = "None"
+				R.fields["mi_dis_d"] = "No minor disabilities have been declared."
+				R.fields["ma_dis"] = "None"
+				R.fields["ma_dis_d"] = "No major disabilities have been diagnosed."
+				R.fields["alg"] = "None"
+				R.fields["alg_d"] = "No allergies have been detected in this patient."
+				R.fields["cdi"] = "None"
+				R.fields["cdi_d"] = "No diseases have been diagnosed at the moment."
+				R.fields["notes"] = "No notes."
+				data_core.medical += R
+				active2 = R
+				screen = MED_DATA_RECORD
+
+		if(href_list["add_c"])
+			if(!istype(active2, /datum/data/record))
+				return 1
+			var/a2 = active2
+			var/t1 = copytext(trim(sanitize(input("Add Comment:", "Med. records", null, null) as message)), 1, MAX_MESSAGE_LEN)
+			if(!t1 || incapable || active2 != a2)
+				return 1
+			active2.fields["comments"] += "Made by [authenticated] ([rank]) on [current_date_string] [worldtime2text()]<BR>[t1]"
+
+		if(href_list["del_c"])
+			var/index = min(max(text2num(href_list["del_c"]) + 1, 1), length(active2.fields["comments"]))
+			if(istype(active2, /datum/data/record) && active2.fields["comments"][index])
+				active2.fields["comments"] -= active2.fields["comments"][index]
+
+		if(href_list["search"])
+			var/t1 = input("Search String: (Name, DNA, or ID)", "Med. records", null, null) as text
+			if(!t1 || incapable)
+				return 1
+			active1 = null
+			active2 = null
+			t1 = lowertext(t1)
+			for(var/datum/data/record/R in data_core.medical)
+				if(t1 == lowertext(R.fields["name"]) || t1 == lowertext(R.fields["id"]) || t1 == lowertext(R.fields["b_dna"]))
+					active2 = R
+			if(!active2)
+				temp = list("text" = "<h3><span class='bad'>Could not locate record [t1].</span></h3>")
+			else
+				for(var/datum/data/record/E in data_core.general)
+					if(E.fields["name"] == active2.fields["name"] && E.fields["id"] == active2.fields["id"])
+						active1 = E
+				screen = MED_DATA_RECORD
+
+		if(href_list["print_p"])
+			if(!printing)
+				printing = 1
+				playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1)
+				sleep(50)
+				var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(loc)
+				P.info = "<CENTER><B>Medical Record</B></CENTER><BR>"
+				if(istype(active1, /datum/data/record) && data_core.general.Find(active1))
+					P.info += {"Name: [active1.fields["name"]] ID: [active1.fields["id"]]
+					<BR>\nSex: [active1.fields["sex"]]
+					<BR>\nAge: [active1.fields["age"]]
+					<BR>\nFingerprint: [active1.fields["fingerprint"]]
+					<BR>\nPhysical Status: [active1.fields["p_stat"]]
+					<BR>\nMental Status: [active1.fields["m_stat"]]<BR>"}
+				else
+					P.info += "<B>General Record Lost!</B><BR>"
+				if(istype(active2, /datum/data/record) && data_core.medical.Find(active2))
+					P.info += {"<BR>\n<CENTER><B>Medical Data</B></CENTER>
+					<BR>\nBlood Type: [active2.fields["b_type"]]
+					<BR>\nDNA: [active2.fields["b_dna"]]<BR>\n
+					<BR>\nMinor Disabilities: [active2.fields["mi_dis"]]
+					<BR>\nDetails: [active2.fields["mi_dis_d"]]<BR>\n
+					<BR>\nMajor Disabilities: [active2.fields["ma_dis"]]
+					<BR>\nDetails: [active2.fields["ma_dis_d"]]<BR>\n
+					<BR>\nAllergies: [active2.fields["alg"]]
+					<BR>\nDetails: [active2.fields["alg_d"]]<BR>\n
+					<BR>\nCurrent Diseases: [active2.fields["cdi"]] (per disease info placed in log/comment section)
+					<BR>\nDetails: [active2.fields["cdi_d"]]<BR>\n
+					<BR>\nImportant Notes:
+					<BR>\n\t[active2.fields["notes"]]<BR>\n
+					<BR>\n
+					<CENTER><B>Comments/Log</B></CENTER><BR>"}
+					for(var/c in active2.fields["comments"])
+						P.info += "[c]<BR>"
+				else
+					P.info += "<B>Medical Record Lost!</B><BR>"
+				P.info += "</TT>"
+				P.name = "paper- 'Medical Record'"
+				printing = 0
+	return 1
+
+/obj/machinery/computer/med_data/proc/setTemp(text, list/buttons = list())
+	temp = list("text" = text, "buttons" = buttons, "has_buttons" = buttons.len > 0)
 
 /obj/machinery/computer/med_data/emp_act(severity)
 	if(stat & (BROKEN|NOPOWER))
-		..(severity)
-		return
+		return ..(severity)
 
 	for(var/datum/data/record/R in data_core.medical)
 		if(prob(10/severity))
@@ -500,7 +535,7 @@
 				if(1)
 					R.fields["name"] = "[pick(pick(first_names_male), pick(first_names_female))] [pick(last_names)]"
 				if(2)
-					R.fields["sex"]	= pick("Male", "Female")
+					R.fields["sex"] = pick("Male", "Female")
 				if(3)
 					R.fields["age"] = rand(5, 85)
 				if(4)
@@ -525,3 +560,10 @@
 	icon_keyboard = "laptop_key"
 	icon_screen = "medlaptop"
 	density = 0
+
+#undef MED_DATA_MAIN
+#undef MED_DATA_R_LIST
+#undef MED_DATA_MAINT
+#undef MED_DATA_RECORD
+#undef MED_DATA_V_DATA
+#undef MED_DATA_MEDBOT
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 7e54aebf396..c3cec37da1a 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1049,12 +1049,11 @@
 						if(R.fields["id"] == E.fields["id"])
 							if(hasHUD(usr,"medical"))
 								read = 1
-								var/counter = 1
-								while(R.fields[text("com_[]", counter)])
-									to_chat(usr, text("[]", R.fields[text("com_[]", counter)]))
-									counter++
-								if(counter == 1)
-									to_chat(usr, "No comment found")
+								if(length(R.fields["comments"]))
+									for(var/c in R.fields["comments"])
+										to_chat(usr, c)
+								else
+									to_chat(usr, "<span class='warning'>No comment found</span>")
 								to_chat(usr, "<a href='?src=[UID()];medrecordadd=`'>\[Add comment\]</a>")
 
 			if(!read)
@@ -1076,18 +1075,15 @@
 					for(var/datum/data/record/R in data_core.medical)
 						if(R.fields["id"] == E.fields["id"])
 							if(hasHUD(usr,"medical"))
-								var/t1 = sanitize(copytext(input("Add Comment:", "Med. records", null, null)	as message,1,MAX_MESSAGE_LEN))
-								if( !(t1) || usr.stat || usr.restrained() || !(hasHUD(usr,"medical")) )
+								var/t1 = copytext(trim(sanitize(input("Add Comment:", "Med. records", null, null) as message)), 1, MAX_MESSAGE_LEN)
+								if(!t1 || usr.stat || usr.restrained() || !hasHUD(usr, "medical"))
 									return
-								var/counter = 1
-								while(R.fields[text("com_[]", counter)])
-									counter++
-								if(istype(usr,/mob/living/carbon/human))
+								if(ishuman(usr))
 									var/mob/living/carbon/human/U = usr
-									R.fields[text("com_[counter]")] = text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]<BR>[t1]")
-								if(istype(usr,/mob/living/silicon/robot))
+									R.fields["comments"] += "Made by [U.get_authentification_name()] ([U.get_assignment()]) on [current_date_string] [worldtime2text()]<BR>[t1]"
+								if(isrobot(usr))
 									var/mob/living/silicon/robot/U = usr
-									R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]<BR>[t1]")
+									R.fields["comments"] += "Made by [U.name] ([U.modtype] [U.braintype]) on [current_date_string] [worldtime2text()]<BR>[t1]"
 
 	if(href_list["lookitem"])
 		var/obj/item/I = locate(href_list["lookitem"])
diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm
index 0fe3a6e75a4..7f821f3779e 100644
--- a/code/modules/paperwork/filingcabinet.dm
+++ b/code/modules/paperwork/filingcabinet.dm
@@ -146,17 +146,15 @@
 		for(var/datum/data/record/G in data_core.general)
 			var/datum/data/record/M
 			for(var/datum/data/record/R in data_core.medical)
-				if((R.fields["name"] == G.fields["name"] || R.fields["id"] == G.fields["id"]))
+				if(R.fields["name"] == G.fields["name"] || R.fields["id"] == G.fields["id"])
 					M = R
 					break
 			var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(src)
 			P.info = "<CENTER><B>Medical Record</B></CENTER><BR>"
 			P.info += "Name: [G.fields["name"]] ID: [G.fields["id"]]<BR>\nSex: [G.fields["sex"]]<BR>\nAge: [G.fields["age"]]<BR>\nFingerprint: [G.fields["fingerprint"]]<BR>\nPhysical Status: [G.fields["p_stat"]]<BR>\nMental Status: [G.fields["m_stat"]]<BR>"
 			P.info += "<BR>\n<CENTER><B>Medical Data</B></CENTER><BR>\nBlood Type: [M.fields["b_type"]]<BR>\nDNA: [M.fields["b_dna"]]<BR>\n<BR>\nMinor Disabilities: [M.fields["mi_dis"]]<BR>\nDetails: [M.fields["mi_dis_d"]]<BR>\n<BR>\nMajor Disabilities: [M.fields["ma_dis"]]<BR>\nDetails: [M.fields["ma_dis_d"]]<BR>\n<BR>\nAllergies: [M.fields["alg"]]<BR>\nDetails: [M.fields["alg_d"]]<BR>\n<BR>\nCurrent Diseases: [M.fields["cdi"]] (per disease info placed in log/comment section)<BR>\nDetails: [M.fields["cdi_d"]]<BR>\n<BR>\nImportant Notes:<BR>\n\t[M.fields["notes"]]<BR>\n<BR>\n<CENTER><B>Comments/Log</B></CENTER><BR>"
-			var/counter = 1
-			while(M.fields["com_[counter]"])
-				P.info += "[M.fields["com_[counter]"]]<BR>"
-				counter++
+			for(var/c in M.fields["comments"])
+				P.info += "[c]<BR>"
 			P.info += "</TT>"
 			P.name = "paper - '[G.fields["name"]]'"
 			virgin = 0	//tabbing here is correct- it's possible for people to try and use it
diff --git a/nano/templates/med_data.tmpl b/nano/templates/med_data.tmpl
new file mode 100644
index 00000000000..f47e13c6885
--- /dev/null
+++ b/nano/templates/med_data.tmpl
@@ -0,0 +1,171 @@
+<!--
+Title: Medical Records UI
+Used In File(s): \code\game\machinery\computer\medical.dm
+-->
+
+<!--
+#define MED_DATA_MAIN	1	// Main menu
+#define MED_DATA_R_LIST	2	// Record list
+#define MED_DATA_MAINT	3	// Records maintenance
+#define MED_DATA_RECORD	4	// Record
+#define MED_DATA_V_DATA	5	// Virus database
+#define MED_DATA_MEDBOT	6	// Medbot monitor
+-->
+
+<div class="item">
+	<div class="itemLabelNarrow">
+		<b>Confirm Identity:</b>
+	</div>
+	<div class="itemContent">
+		{{:helper.link(data.scan ? data.scan : "----------", 'eject', {'scan' : 1}, null, data.scan ? 'itemContentWide' : 'fixedLeft')}}
+	</div>
+</div>
+<hr>
+{{if data.authenticated}}
+	{{if data.screen == 1}} <!-- MED_DATA_MAIN -->
+		<h3>Menu</h3>
+		<div class="item">
+			<div class="line">{{:helper.link('Search Records', 'search', {'search' : 1})}}</div>
+			<div class="line">{{:helper.link('List Records', 'list', {'screen' : 2})}}</div>
+			<div class="line">{{:helper.link('Virus Database', 'database', {'screen' : 5})}}</div>
+			<div class="line">{{:helper.link('Medbot Tracking', 'plus-square', {'screen' : 6})}}</div>
+			<div class="line">{{:helper.link('Record Maintenance', 'wrench', {'screen' : 3})}}</div>
+			<div class="line">{{:helper.link('Logout', 'lock', {'logout' : 1})}}</div>
+		</div>
+	{{else data.screen == 2}} <!-- MED_DATA_R_LIST -->
+		<h3><center>Record List</center></h3>
+		{{for data.records}}
+			<div class="line">{{:helper.link(value.id + ': ' + value.name, 'user', {'d_rec' : value.ref})}}</div>
+		{{/for}}
+		<br><hr>
+		<div class="line">{{:helper.link('Back', 'arrow-left', {'screen' : 1})}}</div>
+	{{else data.screen == 3}} <!-- MED_DATA_MAINT -->
+		<h3>Records Maintenance</h3>
+		<div class="line">{{:helper.link('Backup To Disk', 'download', {'back' : 1}, 'disabled')}}</div>
+		<div class="line">{{:helper.link('Upload From disk', 'upload', {'u_load' : 1}, 'disabled')}}</div>
+		<div class="line">{{:helper.link('Delete All Records', 'trash', {'del_all' : 1})}}</div>
+		<div class="line">{{:helper.link('Back', 'arrow-left', {'screen' : 1})}}</div>
+	{{else data.screen == 4}} <!-- MED_DATA_RECORD -->
+		<h3><center>Medical Record</center></h3>
+		<h4><center>General Data</center></h4>
+		{{if data.general.empty}}
+			<span class="bad"><center>General Record Lost!</center></span>
+		{{else}}
+			<div class="statusDisplayRecords">
+				<table style='width:100%'><tr>
+					<td valign='top' style='margin-right: 300px;'>
+						{{for data.general.fields}}
+							<div class="item">
+								<div class="itemLabel">{{:value.field}}</div>
+								<div class="itemContent">{{:helper.link(value.value, value.edit ? 'pencil' : 'user-times', {'field' : value.edit}, value.edit ? null : 'disabled')}}</div>
+							</div>
+						{{/for}}
+					</td>
+					<td valign='middle' align='center' style='width: 300px;'>
+						{{if data.general.has_photos}}
+							{{for data.general.photos}}
+								{{if value.photo}}
+									<img src={{:value.photo}} height=96 width=96 border=5>
+								{{/if}}
+							{{/for}}
+						{{/if}}
+					</td>
+				</tr></table>
+			</div>
+		{{/if}}
+		
+		<h4><center>Medical Data</center></h4>
+		{{if data.medical.empty}}
+			<span class="bad"><center>Medical Record Lost!</center></span>
+			<div style="text-align: center;">
+				<div style="display: inline-block;">{{:helper.link('New Record', 'plus', {'new' : 1})}}</div>
+			</div>
+			<h3><center>Menu</center></h3>
+		{{else}}
+			{{for data.medical.fields}}
+				<div class="item">
+					<div class="itemLabel">{{:value.field}}</div>
+					<div class="itemContent">{{:helper.link(value.value, 'pencil', {'field' : value.edit})}}</div>
+				</div>
+				{{if value.line_break}}
+					<br>
+				{{/if}}
+			{{/for}}
+				
+			<h4><center>Comments/Log</center></h4>
+			{{for data.medical.comments}}
+				<div class="line">{{:value}}</div>
+				<div class="line">{{:helper.link('Remove entry', 'trash', {'del_c' : index})}}</div>
+				<br><hr>
+			{{/for}}
+			
+			<div style="text-align: center;">
+				<div style="display: inline-block;">{{:helper.link('Add Entry', 'plus', {'add_c' : 1})}}</div>
+			</div>
+			
+			<h3><center>Menu</center></h3>
+			<div class="line">{{:helper.link('Delete Record (Medical Only)', 'trash', {'del_r' : 1})}}</div>
+		{{/if}}
+		
+		<div class="line">{{:helper.link('Print Record', 'print', {'print_p' : 1})}}</div>
+		<div class="line">{{:helper.link('Back', 'arrow-left', {'screen' : 2})}}</div>
+	{{else data.screen == 5}} <!-- MED_DATA_V_DATA -->
+		<h3><center>Virus Database</center></h3>
+		{{for data.virus}}
+			<div class="line">{{:helper.link(value.name, 'arrow-right', {'vir' : value.D})}}</div>
+		{{/for}}
+		<br><hr>
+		{{:helper.link('Back', 'arrow-left', {'screen' : 1})}}
+	{{else data.screen == 6}} <!-- MED_DATA_MEDBOT -->
+		<h3><center>Medical Robot Monitor</center></h3>
+		{{for data.medbots}}
+			<h4>{{:value.name}}</h4>
+			<div class="item">
+				<div class="itemLabel">Location:</div>
+				<div class="itemContent">{{:value.x}}, {{:value.y}}</div>
+			</div>
+			<div class="item">
+				<div class="itemLabel">Status:</div>
+				<div class="itemContent">
+					{{:value.on ? "<span class='good'>Online</span>" : "<span class='average'>Offline</span>"}}. {{if value.use_beaker}}Reservoir: [{{:value.total_volume}}/{{:value.maximum_volume}}]{{else}}Using internal synthesizer.{{/if}}
+				</div>
+			</div>
+			<hr>
+		{{empty}}
+			<h4 class="bad"><center>None detected!</center></h4>
+		{{/for}}
+		<div class="line">{{:helper.link('Back', 'arrow-left', {'screen' : 1})}}</div>
+	{{/if}}
+{{else}}
+	<h3>Menu</h3>
+	{{:helper.link('Login', 'unlock', {'login' : 1})}}
+{{/if}}
+
+{{if data.temp}}
+	<div class="mask" style="display: table;">
+		<div class="maskContent" style="margin: 0px; vertical-align: middle; align:center; display: table-cell;">
+			{{if data.temp.notice}}
+				<div class="notice"><center>{{:data.temp.text}}</center></div>
+			{{else}}
+				<center>{{:data.temp.text}}</center>
+			{{/if}}
+
+			
+			{{if data.temp.has_buttons}}
+				<div class="line">
+					<div style="display: inline-block;">
+						<div style="width: 500px; display: flex; display: -webkit-flex; flex-wrap: wrap; -webkit-flex-wrap: wrap; justify-content: center; -webkit-justify-content: center;">
+							{{for data.temp.buttons}}
+								{{:helper.link(value.name, value.icon, {'temp' : 1, 'temp_action' : value.href}, value.status)}}
+							{{/for}}
+						</div>
+					</div>
+				</div>
+			{{/if}}
+			
+			<div style="display: inline-block;">
+				<div class="item">{{:helper.link('Clear screen', 'home', {'temp' : 1})}}</div>
+			</div>
+		</div>
+	</div>
+{{/if}}
\ No newline at end of file