diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index 9e91e254950..411a2d68d84 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -591,6 +591,16 @@ to destroy them and players will be able to make replacements.
 							/obj/item/stock_parts/micro_laser = 1,
 							/obj/item/stock_parts/console_screen = 1)
 
+/obj/item/circuitboard/reagentgrinder
+	name = "circuit board (All-In-One Grinder)"
+	build_path = /obj/machinery/reagentgrinder/empty
+	board_type = "machine"
+	origin_tech = "materials=2;engineering=2;biotech=2"
+	frame_desc = "Requires 2 Manipulators and 1 Matter Bin."
+	req_components = list(
+							/obj/item/stock_parts/manipulator = 2,
+							/obj/item/stock_parts/matter_bin = 1)
+
 //Almost the same recipe as destructive analyzer to give people choices.
 /obj/item/circuitboard/experimentor
 	name = "circuit board (E.X.P.E.R.I-MENTOR)"
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index 9ea55dd5af7..53afdaadf51 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -9,7 +9,7 @@
 	active_power_usage = 100
 	pass_flags = PASSTABLE
 	var/operating = 0
-	var/obj/item/reagent_containers/beaker = null
+	var/obj/item/reagent_containers/beaker = new /obj/item/reagent_containers/glass/beaker/large
 	var/limit = 10
 
 	//IMPORTANT NOTE! A negative number is a multiplier, a positive number is a flat amount to add. 0 means equal to the amount of the original reagent
@@ -88,10 +88,18 @@
 
 	var/list/holdingitems = list()
 
+/obj/machinery/reagentgrinder/empty
+	icon_state = "juicer0"
+	beaker = null
+
 /obj/machinery/reagentgrinder/New()
 	..()
-	beaker = new /obj/item/reagent_containers/glass/beaker/large(src)
-	return
+	component_parts = list()
+	component_parts += new /obj/item/circuitboard/reagentgrinder(null)
+	component_parts += new /obj/item/stock_parts/manipulator(null)
+	component_parts += new /obj/item/stock_parts/manipulator(null)
+	component_parts += new /obj/item/stock_parts/matter_bin(null)
+	RefreshParts()
 
 /obj/machinery/reagentgrinder/Destroy()
 	QDEL_NULL(beaker)
@@ -112,8 +120,16 @@
 		if(default_unfasten_wrench(user, I))
 				return
 
+		if(anchored && !beaker)
+				if(default_deconstruction_screwdriver(user, "juicer_open", "juicer0", I))
+						return
+
+				if(panel_open && istype(I, /obj/item/crowbar))
+						default_deconstruction_crowbar(I)
+						return
+
 		if (istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER) )
-				if (!beaker)
+				if (!beaker && !panel_open)
 						if(!user.drop_item())
 								return 1
 						beaker =  I
@@ -121,7 +137,10 @@
 						update_icon()
 						src.updateUsrDialog()
 				else
-						to_chat(user, "<span class='warning'>There's already a container inside.</span>")
+						if(!panel_open)
+								to_chat(user, "<span class='warning'>There's already a container inside.</span>")
+						else
+								to_chat(user, "<span class='warning'>Close the maintenance panel first.</span>")
 				return 1 //no afterattack
 
 		if(is_type_in_list(I, dried_items))
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index a23378f5513..7b596752d9c 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -192,6 +192,16 @@
 	build_path = /obj/item/circuitboard/chem_heater
 	category = list ("Medical Machinery")
 
+/datum/design/reagentgrinder
+	name = "Machine Design (All-In-One Grinder)"
+	desc = "The circuit board for a chemical heater."
+	id = "reagentgrinder"
+	req_tech = list("biotech" = 2, "materials" = 2, "programming" = 2)
+	build_type = IMPRINTER
+	materials = list(MAT_GLASS = 1000)
+	build_path = /obj/item/circuitboard/reagentgrinder
+	category = list ("Medical Machinery")
+
 /datum/design/sleeper
 	name = "Machine Board (Sleeper)"
 	desc = "Allows for the construction of circuit boards used to build a Sleeper."
diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi
index b39c3668294..0e9ee4649ac 100644
Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ