diff --git a/baystation12.dme b/baystation12.dme
index 40777b76759..13f0147d9f7 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -503,6 +503,7 @@
 #include "code\game\machinery\kitchen\processor.dm"
 #include "code\game\machinery\pipe\construction.dm"
 #include "code\game\machinery\pipe\pipe_dispenser.dm"
+#include "code\game\magic\archived_book.dm"
 #include "code\game\magic\library.dm"
 #include "code\game\magic\musician.dm"
 #include "code\game\magic\cultist\ritual.dm"
diff --git a/code/game/magic/archived_book.dm b/code/game/magic/archived_book.dm
new file mode 100644
index 00000000000..0e9225c66b6
--- /dev/null
+++ b/code/game/magic/archived_book.dm
@@ -0,0 +1,77 @@
+#define BOOK_VERSION_MIN	1
+#define BOOK_VERSION_MAX	1
+#define BOOK_PATH			"data/books/"
+
+var/global/datum/book_manager/book_mgr = new()
+
+datum/book_manager/proc/path(id)
+	if(isnum(id)) // kill any path exploits
+		return "[BOOK_PATH][id].sav"
+
+datum/book_manager/proc/getall()
+	var/list/paths = flist(BOOK_PATH)
+	var/list/books = new()
+
+	for(var/path in paths)
+		var/datum/archived_book/B = new(BOOK_PATH + path)
+		books += B
+
+	return books
+
+datum/book_manager/proc/freeid()
+	var/list/paths = flist(BOOK_PATH)
+	var/id = paths.len + 101
+
+	// start at 101+number of books, which will be correct id if none have been deleted, etc
+	// otherwise, keep moving forward until we find an open id
+	while(fexists(path(id)))
+		id++
+
+	return id
+
+// delete a book
+datum/book_manager/proc/remove(var/id)
+	fdel(path(id))
+
+datum/archived_book
+	var
+		author		 // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
+		title		 // The real name of the book.
+		category	 // The category/genre of the book
+		id			 // the id of the book (like an isbn number)
+		dat			 // Actual page content
+
+// loads the book corresponding by the specified id
+datum/archived_book/New(var/path)
+	if(isnull(path))
+		return
+
+	var/savefile/F = new(path)
+
+	var/version
+	F["version"] >> version
+
+	if (isnull(version) || version < BOOK_VERSION_MIN || version > BOOK_VERSION_MAX)
+		fdel(path)
+		usr << "What book?"
+		return 0
+
+	F["author"] >> author
+	F["title"] >> title
+	F["category"] >> category
+	F["id"] >> id
+	F["dat"] >> dat
+
+datum/archived_book/proc/save()
+	var/savefile/F = new(book_mgr.path(id))
+
+	F["version"] << BOOK_VERSION_MAX
+	F["author"] << author
+	F["title"] << title
+	F["category"] << category
+	F["id"] << id
+	F["dat"] << dat
+
+#undef BOOK_VERSION_MIN
+#undef BOOK_VERSION_MAX
+#undef BOOK_PATH
diff --git a/code/game/magic/library.dm b/code/game/magic/library.dm
index 8f65ab1b7ab..ca6e10cfd9c 100644
--- a/code/game/magic/library.dm
+++ b/code/game/magic/library.dm
@@ -70,6 +70,36 @@
 	anchored = 1
 	density = 1
 	opacity = 1
+	var/category
+
+	New()
+		var/list/books = book_mgr.getall()
+		var/list/catbooks = new()
+		// get books in category
+		for(var/datum/archived_book/B in books)
+			if(category && !findtext(category, B.category))
+				continue;
+			catbooks += B
+			world << "cat [category]: [B.title]"
+		if(catbooks.len <= 3)
+			// if 3 or less books, fill shelf with that
+			for(var/datum/archived_book/AB in catbooks)
+				var/obj/item/weapon/book/B = new(src)
+				B.name = "Book: [AB.title]"
+				B.title = AB.title
+				B.author = AB.author
+				B.dat = AB.dat
+				B.icon_state = "book[rand(1,7)]"
+		else
+			// otherwise, pick 3 random books
+			for(var/i = 1 to 3)
+				var/datum/archived_book/AB = pick(catbooks)
+				var/obj/item/weapon/book/B = new(src)
+				B.name = "Book: [AB.title]"
+				B.title = AB.title
+				B.author = AB.author
+				B.dat = AB.dat
+				B.icon_state = "book[rand(1,7)]"
 
 	attackby(obj/O as obj, mob/user as mob)
 		if(istype(O, /obj/item/weapon/book))
@@ -192,13 +222,29 @@
 						return
 					else
 						src.name = sanitize(title)
-				else if("Contents")
-					var/content = strip_html(input("Write your book's contents (HTML NOT allowed):"),8192) as message|null
-					if(!content)
+				if("Contents")
+					var/t = "[src.dat]"
+					do
+						t = input(user, "What text do you wish to add?", src.name, t)  as message
+						if ((!in_range(src, usr) && src.loc != user && src.loc.loc != user && user.equipped() != W))
+							return
+
+						if(lentext(t) >= MAX_PAPER_MESSAGE_LEN)
+							var/cont = input(user, "Your message is too long! Would you like to continue editing it?", "", "yes") in list("yes", "no")
+							if(cont == "no")
+								break
+					while(lentext(t) > MAX_PAPER_MESSAGE_LEN)
+
+					if ((!in_range(src, usr) && src.loc != user && src.loc.loc != user && user.equipped() != W))
 						return
-					else
-						src.dat += content
-				else if("Author")
+
+					// check for exploits
+					if(findtext(t, "<script") != 0 || findtext(t, "<frame") != 0 || findtext(t, "<iframe") != 0 || findtext(t, "<input") != 0 || findtext(t, "<button") != 0 || findtext(t, "<a") != 0)
+						user << "\blue You think to yourself, \"Hm.. this is only paper...\""
+						return
+
+					src.dat = t
+				if("Author")
 					var/nauthor = input("Write the author's name:") as text|null
 					if(!nauthor)
 						return
@@ -334,27 +380,43 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 			dat += "<A href='?src=\ref[src];setauthor=1'>Filter by Author: [author]</A><BR>"
 			dat += "<A href='?src=\ref[src];search=1'>\[Start Search\]</A><BR>"
 		if(1)
-			var/DBConnection/dbcon = new()
-			dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]")
-			if(!dbcon.IsConnected())
-				dat += "<font color=red><b>ERROR</b>: Unable to contact External Archive. Please contact your system administrator for assistance.</font><BR>"
-			else if(!SQLquery)
-				dat += "<font color=red><b>ERROR</b>: Malformed search request. Please contact your system administrator for assistance.</font><BR>"
+			if(config.sql_enabled)
+				var/DBConnection/dbcon = new()
+				dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]")
+				if(!dbcon.IsConnected())
+					dat += "<font color=red><b>ERROR</b>: Unable to contact External Archive. Please contact your system administrator for assistance.</font><BR>"
+				else if(!SQLquery)
+					dat += "<font color=red><b>ERROR</b>: Malformed search request. Please contact your system administrator for assistance.</font><BR>"
+				else
+					dat += "<table>"
+					dat += "<tr><td>AUTHOR</td><td>TITLE</td><td>CATEGORY</td><td>SS<sup>13</sup>BN</td></tr>"
+
+					var/DBQuery/query = dbcon.NewQuery(SQLquery)
+					query.Execute()
+
+					while(query.NextRow())
+						var/author = query.item[1]
+						var/title = query.item[2]
+						var/category = query.item[3]
+						var/id = query.item[4]
+						dat += "<tr><td>[author]</td><td>[title]</td><td>[category]</td><td>[id]</td></tr>"
+					dat += "</table><BR>"
+				dbcon.Disconnect()
 			else
 				dat += "<table>"
 				dat += "<tr><td>AUTHOR</td><td>TITLE</td><td>CATEGORY</td><td>SS<sup>13</sup>BN</td></tr>"
 
-				var/DBQuery/query = dbcon.NewQuery(SQLquery)
-				query.Execute()
-
-				while(query.NextRow())
-					var/author = query.item[1]
-					var/title = query.item[2]
-					var/category = query.item[3]
-					var/id = query.item[4]
-					dat += "<tr><td>[author]</td><td>[title]</td><td>[category]</td><td>[id]</td></tr>"
+				var/list/books = book_mgr.getall()
+				for(var/datum/archived_book/book in books)
+					// search queries
+					if(author && !findtext(author, book.author))
+						continue;
+					if(title && !findtext(title, book.title))
+						continue;
+					if(category && !findtext(category, book.category))
+						continue;
+					dat += "<tr><td>[book.author]</td><td>[book.title]</td><td>[book.category]</td><td>[book.id]</td></tr>"
 				dat += "</table><BR>"
-			dbcon.Disconnect()
 			dat += "<A href='?src=\ref[src];back=1'>\[Go Back\]</A><BR>"
 	user << browse(dat, "window=publiclibrary")
 	onclose(user, "publiclibrary")
@@ -382,11 +444,12 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 			author = null
 		author = dd_replacetext(author, "'", "''")
 	if(href_list["search"])
-		SQLquery = "SELECT author, title, category, id FROM library WHERE "
-		if(category == "Any")
-			SQLquery += "author LIKE '%[author]%' AND title LIKE '%[title]%'"
-		else
-			SQLquery += "author LIKE '%[author]%' AND title LIKE '%[title]%' AND category='[category]'"
+		if(config.sql_enabled)
+			SQLquery = "SELECT author, title, category, id FROM library WHERE "
+			if(category == "Any")
+				SQLquery += "author LIKE '%[author]%' AND title LIKE '%[title]%'"
+			else
+				SQLquery += "author LIKE '%[author]%' AND title LIKE '%[title]%' AND category='[category]'"
 		screenstate = 1
 
 	if(href_list["back"])
@@ -478,27 +541,38 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 			dat += "<A href='?src=\ref[src];switchscreen=0'>(Return to main menu)</A><BR>"
 		if(4)
 			dat += "<h3>External Archive</h3>"
-			var/DBConnection/dbcon = new()
-			dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]")
-			if(!dbcon.IsConnected())
-				dat += "<font color=red><b>ERROR</b>: Unable to contact External Archive. Please contact your system administrator for assistance.</font>"
+			if(config.sql_enabled)
+				var/DBConnection/dbcon = new()
+				dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]")
+				if(!dbcon.IsConnected())
+					dat += "<font color=red><b>ERROR</b>: Unable to contact External Archive. Please contact your system administrator for assistance.</font>"
+				else
+					dat += "<A href='?src=\ref[src];orderbyid=1'>(Order book by SS<sup>13</sup>BN)</A><BR><BR>"
+					dat += "<table>"
+					dat += "<tr><td>AUTHOR</td><td>TITLE</td><td>CATEGORY</td><td></td></tr>"
+
+					var/DBQuery/query = dbcon.NewQuery("SELECT id, author, title, category FROM library")
+					query.Execute()
+
+					while(query.NextRow())
+						var/id = query.item[1]
+						var/author = query.item[2]
+						var/title = query.item[3]
+						var/category = query.item[4]
+						dat += "<tr><td>[author]</td><td>[title]</td><td>[category]</td><td><A href='?src=\ref[src];targetid=[id]'>\[Order\]</A></td></tr>"
+					dat += "</table><BR>"
+					dat += "<A href='?src=\ref[src];switchscreen=0'>(Return to main menu)</A><BR>"
+				dbcon.Disconnect()
 			else
 				dat += "<A href='?src=\ref[src];orderbyid=1'>(Order book by SS<sup>13</sup>BN)</A><BR><BR>"
 				dat += "<table>"
 				dat += "<tr><td>AUTHOR</td><td>TITLE</td><td>CATEGORY</td><td></td></tr>"
 
-				var/DBQuery/query = dbcon.NewQuery("SELECT id, author, title, category FROM library")
-				query.Execute()
-
-				while(query.NextRow())
-					var/id = query.item[1]
-					var/author = query.item[2]
-					var/title = query.item[3]
-					var/category = query.item[4]
-					dat += "<tr><td>[author]</td><td>[title]</td><td>[category]</td><td><A href='?src=\ref[src];targetid=[id]'>\[Order\]</A></td></tr>"
+				var/list/books = book_mgr.getall()
+				for(var/datum/archived_book/book in books)
+					dat += "<tr><td>[book.author]</td><td>[book.title]</td><td>[book.category]</td><td>[book.id]</td></tr>"
 				dat += "</table><BR>"
 				dat += "<A href='?src=\ref[src];switchscreen=0'>(Return to main menu)</A><BR>"
-			dbcon.Disconnect()
 		if(5)
 			dat += "<H3>Upload a New Title</H3>"
 			if(!scanner)
@@ -617,52 +691,75 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 			if(scanner.cache)
 				var/choice = input("Are you certain you wish to upload this title to the Archive?") in list("Confirm", "Abort")
 				if(choice == "Confirm")
-					var/DBConnection/dbcon = new()
-					dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]")
-					if(!dbcon.IsConnected())
-						alert("Connection to Archive has been severed. Aborting.")
-					else
-						/*
-						var/sqltitle = dbcon.Quote(scanner.cache.name)
-						var/sqlauthor = dbcon.Quote(scanner.cache.author)
-						var/sqlcontent = dbcon.Quote(scanner.cache.dat)
-						var/sqlcategory = dbcon.Quote(upload_category)
-						*/
-						var/sqltitle = dd_replacetext(scanner.cache.name, "'", "''")
-						var/sqlauthor = dd_replacetext(scanner.cache.author, "'", "''")
-						var/sqlcontent = dd_replacetext(scanner.cache.dat, "'", "''")
-						var/sqlcategory = upload_category
-						///proc/dd_replacetext(text, search_string, replacement_string)
-						var/DBQuery/query = dbcon.NewQuery("INSERT INTO library (author, title, content, category) VALUES ('[sqlauthor]', '[sqltitle]', '[sqlcontent]', '[sqlcategory]')")
-						if(!query.Execute())
-							usr << query.ErrorMsg()
+					if(config.sql_enabled)
+						var/DBConnection/dbcon = new()
+						dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]")
+						if(!dbcon.IsConnected())
+							alert("Connection to Archive has been severed. Aborting.")
 						else
-							log_game("[usr.name]/[usr.key] has uploaded the book titled [scanner.cache.name], [length(scanner.cache.dat)] signs")
-							alert("Upload Complete.")
-						dbcon.Disconnect()
-	if(href_list["targetid"])
-		var/sqlid = href_list["targetid"]
-		var/DBConnection/dbcon = new()
-		dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]")
-		if(!dbcon.IsConnected())
-			alert("Connection to Archive has been severed. Aborting.")
-		else
-			var/DBQuery/query = dbcon.NewQuery("SELECT * FROM library WHERE id=[sqlid]")
-			query.Execute()
+							/*
+							var/sqltitle = dbcon.Quote(scanner.cache.name)
+							var/sqlauthor = dbcon.Quote(scanner.cache.author)
+							var/sqlcontent = dbcon.Quote(scanner.cache.dat)
+							var/sqlcategory = dbcon.Quote(upload_category)
+							*/
+							var/sqltitle = dd_replacetext(scanner.cache.name, "'", "''")
+							var/sqlauthor = dd_replacetext(scanner.cache.author, "'", "''")
+							var/sqlcontent = dd_replacetext(scanner.cache.dat, "'", "''")
+							var/sqlcategory = upload_category
+							///proc/dd_replacetext(text, search_string, replacement_string)
+							var/DBQuery/query = dbcon.NewQuery("INSERT INTO library (author, title, content, category) VALUES ('[sqlauthor]', '[sqltitle]', '[sqlcontent]', '[sqlcategory]')")
+							if(!query.Execute())
+								usr << query.ErrorMsg()
+							else
+								log_game("[usr.name]/[usr.key] has uploaded the book titled [scanner.cache.name], [length(scanner.cache.dat)] signs")
+								alert("Upload Complete.")
+							dbcon.Disconnect()
+					else
+						var/datum/archived_book/B = new()
+						B.title = scanner.cache.name
+						B.author = scanner.cache.author
+						B.dat = scanner.cache.dat
+						B.category = upload_category
+						B.id = book_mgr.freeid()
+						B.save()
+
+						log_game("[usr.name]/[usr.key] has uploaded the book titled [scanner.cache.name], [length(scanner.cache.dat)] signs")
+						alert("Upload Complete.")
+	if(href_list["targetid"])
+		if(config.sql_enabled)
+			var/sqlid = href_list["targetid"]
+			var/DBConnection/dbcon = new()
+			dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]")
+			if(!dbcon.IsConnected())
+				alert("Connection to Archive has been severed. Aborting.")
+			else
+				var/DBQuery/query = dbcon.NewQuery("SELECT * FROM library WHERE id=[sqlid]")
+				query.Execute()
+
+				while(query.NextRow())
+					var/author = query.item[2]
+					var/title = query.item[3]
+					var/content = query.item[4]
+					var/obj/item/weapon/book/B = new(src.loc)
+					B.name = "Book: [title]"
+					B.title = title
+					B.author = author
+					B.dat = content
+					B.icon_state = "book[rand(1,7)]"
+					src.visible_message("[src]'s printer hums as it produces a completely bound book. How did it do that?")
+					break
+				dbcon.Disconnect()
+		else
+			var/datum/archived_book/AB = new(book_mgr.path(href_list["targetid"]))
+			var/obj/item/weapon/book/B = new(src.loc)
+			B.name = "Book: [AB.title]"
+			B.title = AB.title
+			B.author = AB.author
+			B.dat = AB.dat
+			B.icon_state = "book[rand(1,7)]"
+			src.visible_message("[src]'s printer hums as it produces a completely bound book. How did it do that?")
 
-			while(query.NextRow())
-				var/author = query.item[2]
-				var/title = query.item[3]
-				var/content = query.item[4]
-				var/obj/item/weapon/book/B = new(src.loc)
-				B.name = "Book: [title]"
-				B.title = title
-				B.author = author
-				B.dat = content
-				B.icon_state = "book[rand(1,7)]"
-				src.visible_message("[src]'s printer hums as it produces a completely bound book. How did it do that?")
-				break
-			dbcon.Disconnect()
 	if(href_list["orderbyid"])
 		var/orderid = input("Enter your order:") as num|null
 		if(orderid)
diff --git a/config/config.txt b/config/config.txt
index e5b793c4356..7032ee06417 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -20,7 +20,7 @@ LOG_VOTE
 LOG_WHISPER
 
 ## sql switching
-# SQL_ENABLED
+SQL_ENABLED 0
 
 ## disconnect players who did nothing during 10 minutes
 # KICK_INACTIVE
diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm
index c8a2f393724..6ab9917f092 100644
--- a/maps/tgstation.2.0.8.dmm
+++ b/maps/tgstation.2.0.8.dmm
@@ -1676,7 +1676,7 @@
 "aGl" = (/turf/simulated/floor{icon_state = "L12"},/area/hallway/primary/central)
 "aGm" = (/turf/simulated/floor{desc = "<p>There is some old writing on this floor. You are barely able to read out a few lines from a tangled scribble.</p><p>Bruce Stachie the First</p>"; icon_state = "L14"},/area/hallway/primary/central)
 "aGn" = (/turf/simulated/floor{icon_state = "L16"},/area/hallway/primary/central)
-"aGo" = (/obj/structure/bookcase{name = "bookcase (Adult)"},/turf/simulated/floor{icon_state = "wood"},/area/library)
+"aGo" = (/obj/structure/bookcase{category = "Adult"; name = "bookcase (Adult)"},/turf/simulated/floor{icon_state = "wood"},/area/library)
 "aGp" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{icon_state = "wood"},/area/library)
 "aGq" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/stool{pixel_y = 8},/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor{icon_state = "dark"},/area/library)
 "aGr" = (/obj/machinery/atmospherics/pipe/simple{dir = 9; icon_state = "intact-f"},/obj/structure/bookcase{name = "Forbidden Knowledge"},/turf/simulated/floor{icon_state = "dark"},/area/library)
@@ -1795,7 +1795,7 @@
 "aIA" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/hallway/primary/central)
 "aIB" = (/turf/simulated/floor{dir = 1; icon_state = "bluecorner"},/area/hallway/primary/central)
 "aIC" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/library)
-"aID" = (/obj/structure/bookcase{name = "bookcase (Religious)"},/turf/simulated/floor{icon_state = "wood"},/area/library)
+"aID" = (/obj/structure/bookcase{category = "Religion"; name = "bookcase (Religious)"},/turf/simulated/floor{icon_state = "wood"},/area/library)
 "aIE" = (/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 20},/obj/structure/table/woodentable,/obj/item/weapon/paper,/turf/simulated/floor{icon_state = "wood"},/area/library)
 "aIF" = (/obj/structure/table/woodentable,/obj/machinery/librarycomp{pixel_y = 8},/turf/simulated/floor{icon_state = "wood"},/area/library)
 "aIG" = (/obj/structure/stool{pixel_y = 8},/turf/simulated/floor{icon_state = "wood"},/area/library)
@@ -1932,7 +1932,7 @@
 "aLh" = (/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/bridge)
 "aLi" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/stool/chair{dir = 1},/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/bridge)
 "aLj" = (/turf/simulated/floor{icon_state = "whitehall"; dir = 5},/area/bridge)
-"aLk" = (/obj/structure/bookcase{name = "bookcase (Fiction)"},/turf/simulated/floor{icon_state = "wood"},/area/library)
+"aLk" = (/obj/structure/bookcase{category = "Fiction"; name = "bookcase (Fiction)"},/turf/simulated/floor{icon_state = "wood"},/area/library)
 "aLl" = (/obj/structure/table/woodentable,/obj/item/weapon/pen,/turf/simulated/floor{icon_state = "wood"},/area/library)
 "aLm" = (/obj/machinery/door/window/northright{dir = 1; name = "library desk door"; req_access_txt = "37"},/turf/simulated/floor{icon_state = "wood"},/area/library)
 "aLn" = (/obj/machinery/camera{c_tag = "Hydroponics West Maintenance"; dir = 8; network = "SS13"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 8; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
@@ -2068,7 +2068,7 @@
 "aNN" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor{dir = 9; icon_state = "blue"},/area/hallway/primary/central)
 "aNO" = (/obj/item/device/radio/intercom{broadcasting = 0; layer = 4; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/hallway/primary/central)
 "aNP" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor,/area/hallway/primary/central)
-"aNQ" = (/obj/structure/bookcase{name = "bookcase (Non-Fiction)"},/turf/simulated/floor{icon_state = "wood"},/area/library)
+"aNQ" = (/obj/structure/bookcase{category = "Non-Fiction"; name = "bookcase (Non-Fiction)"},/turf/simulated/floor{icon_state = "wood"},/area/library)
 "aNR" = (/obj/structure/stool/chair,/turf/simulated/floor,/area/library)
 "aNS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "dark"},/area/library)
 "aNT" = (/obj/machinery/hydroponics,/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "dark"},/area/hydroponics)
@@ -2224,7 +2224,7 @@
 "aQN" = (/obj/machinery/camera{c_tag = "Bridge East"; dir = 1},/obj/structure/closet/emcloset,/turf/simulated/floor{dir = 0; icon_state = "blue"},/area/bridge)
 "aQO" = (/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor{icon_state = "blue"; dir = 10},/area/hallway/primary/central)
 "aQP" = (/obj/machinery/power/apc{dir = 2; name = "Central Hall APC"; pixel_y = -24},/obj/structure/cable,/turf/simulated/floor{dir = 0; icon_state = "blue"},/area/hallway/primary/central)
-"aQQ" = (/obj/structure/bookcase{name = "bookcase (Reference)"},/turf/simulated/floor{icon_state = "wood"},/area/library)
+"aQQ" = (/obj/structure/bookcase{category = "Reference"; name = "bookcase (Reference)"},/turf/simulated/floor{icon_state = "wood"},/area/library)
 "aQR" = (/obj/structure/stool/chair{dir = 1},/turf/simulated/floor,/area/library)
 "aQS" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 5; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
 "aQT" = (/obj/machinery/hydroponics,/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 1; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "dark"},/area/hydroponics)
@@ -6339,7 +6339,7 @@
 "crU" = (/obj/structure/signpost,/turf/unsimulated/floor{icon_state = "asteroid"; name = "dust"},/area)
 "crV" = (/obj/structure/bookcase/manuals/medical,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station)
 "crW" = (/obj/effect/decal/cleanable/cobweb,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station)
-"crX" = (/obj/structure/bookcase{name = "bookcase (Adult)"},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station)
+"crX" = (/obj/structure/bookcase{category = "Adult"; name = "bookcase (Adult)"},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station)
 "crY" = (/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station)
 "crZ" = (/obj/structure/bookcase{name = "bookcase (Reports)"},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station)
 "csa" = (/obj/structure/table/woodentable,/obj/machinery/librarycomp,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station)
@@ -6351,7 +6351,7 @@
 "csg" = (/turf/unsimulated/floor{icon_state = "grimy"},/area/wizard_station)
 "csh" = (/obj/structure/table/woodentable,/obj/effect/landmark{name = "Teleport-Scroll"},/turf/unsimulated/floor{icon_state = "grimy"},/area/wizard_station)
 "csi" = (/obj/structure/bookcase/manuals/engineering,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station)
-"csj" = (/obj/structure/bookcase{name = "bookcase (Fiction)"},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station)
+"csj" = (/obj/structure/bookcase{category = "Fiction"; name = "bookcase (Fiction)"},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station)
 "csk" = (/obj/structure/stool,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station)
 "csl" = (/obj/machinery/door/window/eastleft,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station)
 "csm" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/turf/unsimulated/floor{icon_state = "grimy"},/area/wizard_station)
@@ -6360,7 +6360,7 @@
 "csp" = (/obj/structure/bookcase/manuals/research_and_development,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station)
 "csq" = (/obj/structure/bookcase{name = "bookcase (Tactics)"},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station)
 "csr" = (/obj/structure/table/woodentable,/obj/item/weapon/paper{info = "<p><b>LIST OF SPELLS AVAILABLE</b></p><p>Magic Missile:<br>This spell fires several, slow moving, magic projectiles at nearby targets. If they hit a target, it is paralyzed and takes minor damage.</p><p>Fireball:<br>This spell fires a fireball at a target and does not require wizard garb. Be careful not to fire it at people that are standing next to you.</p><p>Disintegrate:</br>This spell instantly kills somebody adjacent to you with the vilest of magick. It has a long cooldown.</p><p>Disable Technology:<br>This spell disables all weapons, cameras and most other technology in range.</p><p>Smoke:<br>This spell spawns a cloud of choking smoke at your location and does not require wizard garb.</p><p>Blind:<br>This spell temporarly blinds a single person and does not require wizard garb.<p>Forcewall:<br>This spell creates an unbreakable wall that lasts for 30 seconds and does not require wizard garb.</p><p>Blink:<br>This spell randomly teleports you a short distance. Useful for evasion or getting into areas if you have patience.</p><p>Teleport:<br>This spell teleports you to a type of area of your selection. Very useful if you are in danger, but has a decent cooldown, and is unpredictable.</p><p>Mutate:<br>This spell causes you to turn into a hulk, and gain telekinesis for a short while.</p><p>Ethereal Jaunt:<br>This spell creates your ethereal form, temporarily making you invisible and able to pass through walls.</p><p>Knock:<br>This spell opens nearby doors and does not require wizard garb.</p>"; name = "List of Available Spells (READ)"},/turf/unsimulated/floor{icon_state = "grimy"},/area/wizard_station)
-"css" = (/obj/structure/bookcase{name = "bookcase (Adult)"},/turf/unsimulated/floor{icon_state = "grimy"},/area/wizard_station)
+"css" = (/obj/structure/bookcase{category = "Adult"; name = "bookcase (Adult)"},/turf/unsimulated/floor{icon_state = "grimy"},/area/wizard_station)
 "cst" = (/turf/unsimulated/floor{dir = 9; icon_state = "carpetside"},/area/wizard_station)
 "csu" = (/obj/structure/stool,/turf/unsimulated/floor{dir = 1; icon_state = "carpetside"},/area/wizard_station)
 "csv" = (/turf/unsimulated/wall{icon = 'walls.dmi'; icon_state = "rock"; name = "grass"},/area/planet/clown)