diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 7285b4628b0..192446d262b 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -16,6 +16,7 @@
 	var/spreadChance = 0 //the percentual chance of an ore spreading to the neighbouring tiles
 	var/artifactChance = 0.3	//percent chance to spawn a xenoarchaelogical artifact
 	var/last_act = 0
+	var/datum/geosample/geological_data
 
 /turf/simulated/mineral/Del()
 	return
@@ -54,6 +55,9 @@
 			if (T)
 				T.overlays += image('icons/turf/walls.dmi', "rock_side_e", layer=6)
 
+	src.geological_data = new /datum/geosample
+	src.geological_data.UpdateTurf(src)
+
 	if (mineralName && mineralAmt && spread && spreadChance)
 		if(prob(spreadChance))
 			if(istype(get_step(src, SOUTH), /turf/simulated/mineral/random))
@@ -102,6 +106,9 @@
 			if(M)
 				src = M
 				M.levelupdate()
+				if(!geological_data)
+					src.geological_data = new /datum/geosample
+				src.geological_data.UpdateTurf(src)
 	else if (prob(artifactChance))
 		//spawn a rare, xeno-arch artifact here
 		new/obj/machinery/artifact(src)
@@ -220,6 +227,11 @@
 		usr << "\red You don't have the dexterity to do this!"
 		return
 
+	if (istype(W, /obj/item/device/core_sampler))
+		var/obj/item/device/core_sampler/C = W
+		C.sample_item(src, user)
+		return
+
 	if (istype(W, /obj/item/weapon/pickaxe))
 		var/turf/T = user.loc
 		if (!( istype(T, /turf) ))
@@ -250,27 +262,34 @@
 	if ((src.mineralName != "") && (src.mineralAmt > 0) && (src.mineralAmt < 11))
 		var/i
 		for (i=0;i<mineralAmt;i++)
+			var/obj/item/weapon/ore/O
 			if (src.mineralName == "Uranium")
-				new /obj/item/weapon/ore/uranium(src)
+				O = new /obj/item/weapon/ore/uranium(src)
 			if (src.mineralName == "Iron")
-				new /obj/item/weapon/ore/iron(src)
+				O = new /obj/item/weapon/ore/iron(src)
 			if (src.mineralName == "Gold")
-				new /obj/item/weapon/ore/gold(src)
+				O = new /obj/item/weapon/ore/gold(src)
 			if (src.mineralName == "Silver")
-				new /obj/item/weapon/ore/silver(src)
+				O = new /obj/item/weapon/ore/silver(src)
 			if (src.mineralName == "Plasma")
-				new /obj/item/weapon/ore/plasma(src)
+				O = new /obj/item/weapon/ore/plasma(src)
 			if (src.mineralName == "Diamond")
-				new /obj/item/weapon/ore/diamond(src)
+				O = new /obj/item/weapon/ore/diamond(src)
 			if (src.mineralName == "Archaeo")
 				//spawn strange rocks here
 				//if(prob(10) || delicate)
 				if(prob(50)) //Don't have delicate tools (hand pick/excavation tool) yet, temporarily change to 50% instead of 10% -Mij
-					new /obj/item/weapon/ore/strangerock(src)
+					O = new /obj/item/weapon/ore/strangerock(src)
 				else
 					destroyed = 1
 			if (src.mineralName == "Clown")
-				new /obj/item/weapon/ore/clown(src)
+				O = new /obj/item/weapon/ore/clown(src)
+			if(O)
+				if(!src.geological_data)
+					src.geological_data = new /datum/geosample
+					src.geological_data.UpdateTurf(src)
+				O.geological_data = src.geological_data
+
 	if (prob(src.artifactChance))
 		//spawn a rare, xeno-archaelogical artifact here
 		new /obj/machinery/artifact(src)
diff --git a/code/modules/mining/ores_materials_coins.dm b/code/modules/mining/ores_materials_coins.dm
index 498af8caead..4a7fcc9c732 100644
--- a/code/modules/mining/ores_materials_coins.dm
+++ b/code/modules/mining/ores_materials_coins.dm
@@ -4,6 +4,7 @@
 	name = "Rock"
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "ore"
+	var/datum/geosample/geological_data
 
 
 /obj/item/weapon/ore/uranium
@@ -66,12 +67,19 @@
 	var/obj/inside
 	var/method // 0 = fire, 1+ = acid
 	origin_tech = "materials=5"
-	//unacidable = 1 //This can prevent acid from gooey grey massing
+	//unacidable = 1	//This can prevent acid from gooey grey massing
+						//you should override the acid_act proc anyway
 
 /obj/item/weapon/ore/New()
 	pixel_x = rand(0,16)-8
 	pixel_y = rand(0,8)-8
 
+/obj/item/weapon/ore/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W,/obj/item/device/core_sampler))
+		var/obj/item/device/core_sampler/C = W
+		C.sample_item(src, user)
+	else
+		return ..()
 
 /*****************************Coin********************************/
 
diff --git a/code/modules/research/xenoarchaeology/core_sampler.dm b/code/modules/research/xenoarchaeology/core_sampler.dm
index c9adaf51af1..b123fed02e1 100644
--- a/code/modules/research/xenoarchaeology/core_sampler.dm
+++ b/code/modules/research/xenoarchaeology/core_sampler.dm
@@ -1,18 +1,15 @@
 //device to take core samples from mineral turfs - used for various types of analysis
 
-/obj/item/weapon/storage/samplebag
-	name = "sample bag"
-	desc = "A geological sample bag."
-	icon_state = "evidenceobj"
-	w_class = 1
-	max_w_class = 1
-	max_combined_w_class = 7
-	storage_slots = 7
-
-//////////////////////////////////////////////////////////////////
-
-/turf/simulated/mineral
-	var/datum/geosample/geological_data
+/obj/item/weapon/storage/box/samplebags
+	name = "sample bag box"
+	desc = "A box claiming to contain sample bags."
+	New()
+		for(var/i=0, i<7, i++)
+			var/obj/item/weapon/evidencebag/S = new(src)
+			S.name = "sample bag"
+			S.desc = "a bag for holding research samples."
+		..()
+		return
 
 //////////////////////////////////////////////////////////////////
 
@@ -27,43 +24,76 @@
 	//slot_flags = SLOT_BELT
 	var/sampled_turf = ""
 	var/num_stored_bags = 10
-	var/obj/item/weapon/storage/samplebag/filled_bag
-
-/obj/item/device/core_sampler/attack_hand(var/mob/user)
-	user << "\blue The core sampler is [sampled_turf ? "full" : "empty"], and has [num_stored_bags] sample bag[num_stored_bags != 1] remaining."
-
-/obj/item/device/core_sampler/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(istype(W,/obj/item/weapon/storage/samplebag))
-		if(num_stored_bags < 10)
-			del(W)
-			num_stored_bags += 1
-			user << "\blue You insert the sample bag into the core sampler."
-		else
-			user << "\red The core sampler can not fit any more sample bags!"
-	else
-		return ..()
-
-/obj/item/device/core_sampler/proc/sample_turf(var/turf/simulated/mineral/T, var/mob/user as mob)
-	if(filled_bag)
-		user << "\red The core sampler is full!"
-	else if(num_stored_bags < 1)
-		user << "\red The core sampler is out of sample bags!"
-	else
-		filled_bag = new /obj/item/weapon/storage/samplebag(src)
-		icon_state = "sampler1"
-
-		for(var/i=0, i<7, i++)
-			var/obj/item/weapon/rocksliver/R = new(filled_bag)
-			R.source_rock = T.type
-			R.geological_data = T.geological_data
-
-		user << "\blue You take a core sample of the [T]."
+	var/obj/item/weapon/evidencebag/filled_bag
 
 /obj/item/device/core_sampler/examine()
 	if (!( usr ))
 		return
 	if(get_dist(src, usr) < 2)
 		usr << "That's \a [src]."
-		usr << "\blue Used to extract geological core samples - this one is [sampled_turf ? "full" : "empty"], and has [num_stored_bags] sample bag[num_stored_bags != 1] remaining."
+		usr << "\blue Used to extract geological core samples - this one is [sampled_turf ? "full" : "empty"], and has [num_stored_bags] bag[num_stored_bags != 1 ? "s" : ""] remaining."
 	else
 		return ..()
+
+/obj/item/device/core_sampler/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W,/obj/item/weapon/evidencebag))
+		if(num_stored_bags < 10)
+			del(W)
+			num_stored_bags += 1
+			user << "\blue You insert the [W] into the core sampler."
+		else
+			user << "\red The core sampler can not fit any more bags!"
+	else
+		return ..()
+
+/obj/item/device/core_sampler/proc/sample_item(var/item_to_sample, var/mob/user as mob)
+	var/datum/geosample/geo_data
+	if(istype(item_to_sample, /turf/simulated/mineral))
+		var/turf/simulated/mineral/T = item_to_sample
+		geo_data = T.geological_data
+	else if(istype(item_to_sample, /obj/item/weapon/ore))
+		var/obj/item/weapon/ore/O = item_to_sample
+		geo_data = O.geological_data
+
+	if(geo_data)
+		if(filled_bag)
+			user << "\red The core sampler is full!"
+		else if(num_stored_bags < 1)
+			user << "\red The core sampler is out of sample bags!"
+		else
+			//create a new sample bag which we'll fill with rock samples
+			filled_bag = new /obj/item/weapon/evidencebag(src)
+			filled_bag.name = "sample bag"
+			filled_bag.desc = "a bag for holding research samples."
+
+			icon_state = "sampler1"
+			num_stored_bags--
+
+			//put in a rock sliver
+			var/obj/item/weapon/rocksliver/R = new()
+			R.geological_data = geo_data
+			R.loc = filled_bag
+
+			//update the sample bag
+			filled_bag.icon_state = "evidence"
+			var/image/I = image("icon"=R, "layer"=FLOAT_LAYER)
+			filled_bag.underlays += I
+			filled_bag.w_class = 1
+
+			user << "\blue You take a core sample of the [item_to_sample]."
+	else
+		user << "\red You are unable to take a sample of [item_to_sample]."
+
+/obj/item/device/core_sampler/attack_self()
+	if(filled_bag)
+		usr << "\blue You eject the full sample bag."
+		var/success = 0
+		if(istype(src.loc, /mob))
+			var/mob/M = src.loc
+			success = M.put_in_inactive_hand(filled_bag)
+		if(!success)
+			filled_bag.loc = get_turf(src)
+		filled_bag = null
+		icon_state = "sampler0"
+	else
+		usr << "\red The core sampler is empty."
diff --git a/code/modules/research/xenoarchaeology/finds.dm b/code/modules/research/xenoarchaeology/finds.dm
index 4e448e8518e..082f20ebb32 100644
--- a/code/modules/research/xenoarchaeology/finds.dm
+++ b/code/modules/research/xenoarchaeology/finds.dm
@@ -1,4 +1,4 @@
-//original code and idea from Alfie275 (luna) and ISaidNo (goon) - with thanks
+//original code and idea from Alfie275 (luna era) and ISaidNo (goonservers) - with thanks
 
 
 
@@ -11,13 +11,14 @@
 	desc = "It looks extremely delicate."
 	icon = 'mining.dmi'
 	icon_state = "sliver0"	//0-4
+	w_class = 1
 	//item_state = "electronic"
 	var/source_rock = "/turf/simulated/mineral/archaeo"
 	item_state = ""
 	var/datum/geosample/geological_data
 
 /obj/item/weapon/rocksliver/New()
-	icon_state = "sliver[rand(0,4)]"
+	icon_state = "ore2"//"sliver[rand(0,4)]"
 
 
 
@@ -25,10 +26,6 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // strange rocks
 
-/obj/item/weapon/ore/strangerock
-	var/datum/geosample/geological_data
-	var/source_rock = "/turf/simulated/mineral"
-
 /obj/item/weapon/ore/strangerock/New()
 	..()
 	//var/datum/reagents/r = new/datum/reagents(50)
@@ -66,19 +63,7 @@
 
 	else if(istype(W,/obj/item/device/core_sampler/))
 		var/obj/item/device/core_sampler/S = W
-		if(S.filled_bag)
-			user << "\red The core sampler is full!"
-		else if(S.num_stored_bags < 1)
-			user << "\red The core sampler is out of sample bags!"
-		else
-			S.filled_bag = new /obj/item/weapon/storage/samplebag(S)
-			S.icon_state = "sampler1"
-
-			for(var/i=0, i<7, i++)
-				var/obj/item/weapon/rocksliver/R = new /obj/item/weapon/rocksliver(S.filled_bag)
-				R.source_rock = src.source_rock
-				R.geological_data = src.geological_data
-			user << "\blue You take a core sample of the [src]."
+		S.sample_item(src, user)
 
 /*Code does not work, likely due to removal/change of acid_act proc
 //Strange rocks currently melt to gooey grey w/ acid application (see reactions)
diff --git a/code/modules/research/xenoarchaeology/geosample.dm b/code/modules/research/xenoarchaeology/geosample.dm
index cf45b88b24b..a3d64309464 100644
--- a/code/modules/research/xenoarchaeology/geosample.dm
+++ b/code/modules/research/xenoarchaeology/geosample.dm
@@ -2,20 +2,24 @@
 datum/geosample
 	var/scrambled = 0	//if this sample has been mixed with other samples
 	//
-	var/age_thousand = 1					//age can correspond to different artifacts
+	var/age = 0
+	var/age_thousand = 0					//age can correspond to different artifacts
 	var/age_million = 0
 	var/age_billion = 0
 	var/artifact_id = ""					//id of a nearby artifact, if there is one
 	var/artifact_strength = 0				//proportional to distance
 	var/responsive_reagent = ""				///each reagent corresponds to a different type of find
 	var/reagent_response = ""				//likelihood of there being finds there
+	//
+	var/source_mineral
 
 datum/geosample/New(var/turf/simulated/mineral/container)
 	UpdateTurf(container)
 
 //this function should only be called once. it's here just in case
 datum/geosample/proc/UpdateTurf(var/turf/simulated/mineral/container)
-	src = null
+	source_mineral = container.mineralName
+	age = rand(1,999)
 	switch(container.mineralName)
 		if("Uranium")
 			age_million = rand(1, 704)
@@ -37,6 +41,11 @@ datum/geosample/proc/UpdateTurf(var/turf/simulated/mineral/container)
 			age_thousand = rand(1,999)
 			age_million = rand(1,999)
 			age_billion = rand(10, 13)
-		if("Archaeo")
+		if("Clown")
+			age = rand(-1,-999)
+			age_thousand = rand(-1,-999)
+		/*if("Archaeo")
 			//snowflake
-			age_thousand = rand(1,999)
+			age_thousand = rand(1,999)*/
+		else
+			source_mineral = "Rock"
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index e57a75e0525..1104878db8e 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ