diff --git a/code/modules/photography/_pictures.dm b/code/modules/photography/_pictures.dm
index 6f85cdb3a6..dace901cea 100644
--- a/code/modules/photography/_pictures.dm
+++ b/code/modules/photography/_pictures.dm
@@ -76,7 +76,7 @@
 /proc/load_photo_from_disk(id, location)
 	var/datum/picture/P = load_picture_from_disk(id)
 	if(istype(P))
-		var/obj/item/photo/p = new(location, P)
+		var/obj/item/photo/old/p = new(location, P)
 		return p
 
 /proc/load_picture_from_disk(id)
diff --git a/code/modules/photography/photos/album.dm b/code/modules/photography/photos/album.dm
index 6f35e7a99d..48a9203553 100644
--- a/code/modules/photography/photos/album.dm
+++ b/code/modules/photography/photos/album.dm
@@ -48,7 +48,7 @@
 	for(var/i in ids)
 		if(i in current_ids)
 			continue
-		var/obj/item/photo/P = load_photo_from_disk(i)
+		var/obj/item/photo/old/P = load_photo_from_disk(i)
 		if(istype(P))
 			if(!SEND_SIGNAL(src, COMSIG_TRY_STORAGE_INSERT, P, null, TRUE, TRUE))
 				qdel(P)
diff --git a/code/modules/photography/photos/frame.dm b/code/modules/photography/photos/frame.dm
index 4000bf843c..45aa4aeb79 100644
--- a/code/modules/photography/photos/frame.dm
+++ b/code/modules/photography/photos/frame.dm
@@ -98,7 +98,7 @@
 		load_from_id(data[persistence_id])
 
 /obj/structure/sign/picture_frame/proc/load_from_id(id)
-	var/obj/item/photo/P = load_photo_from_disk(id)
+	var/obj/item/photo/old/P = load_photo_from_disk(id)
 	if(istype(P))
 		if(istype(framed))
 			framed.forceMove(drop_location())
diff --git a/modular_splurt/code/datums/traits/good.dm b/modular_splurt/code/datums/traits/good.dm
index 1984a6a73f..70a84f4d82 100644
--- a/modular_splurt/code/datums/traits/good.dm
+++ b/modular_splurt/code/datums/traits/good.dm
@@ -1,3 +1,18 @@
+//Main code edits
+/datum/quirk/photographer
+	desc = "You carry your camera and personal photo album everywhere you go, and you're quicker at taking pictures."
+
+/datum/quirk/photographer/on_spawn()
+	. = ..()
+	var/mob/living/carbon/human/H = quirk_holder
+	var/obj/item/storage/photo_album/photo_album = new(get_turf(H))
+	H.put_in_hands(photo_album)
+	H.equip_to_slot(photo_album, ITEM_SLOT_BACKPACK)
+	photo_album.persistence_id = "personal_[H.mind.key]" // this is a persistent album, the ID is tied to the account's key to avoid tampering
+	photo_album.persistence_load()
+	photo_album.name = "[H.real_name]'s photo album"
+
+//Own stuff
 /datum/quirk/tough
 	name = "Tough"
 	desc = "Your body is abnormally enduring and can take 10% more damage."
diff --git a/modular_splurt/code/modules/photography/photos/album.dm b/modular_splurt/code/modules/photography/photos/album.dm
new file mode 100644
index 0000000000..f7795a670e
--- /dev/null
+++ b/modular_splurt/code/modules/photography/photos/album.dm
@@ -0,0 +1,27 @@
+/obj/item/storage/photo_album
+	desc = "A big book used to store photos and mementos."
+	item_state = "album"
+	lefthand_file = 'modular_splurt/icons/mob/inhands/misc/books_lefthand.dmi'
+	righthand_file = 'modular_splurt/icons/mob/inhands/misc/books_righthand.dmi'
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/storage/photo_album/HoS
+	name = "photo album (Head of Security)"
+
+/obj/item/storage/photo_album/RD
+	name = "photo album (Research Director)"
+
+/obj/item/storage/photo_album/HoP
+	name = "photo album (Head of Personnel)"
+
+/obj/item/storage/photo_album/Captain
+	name = "photo album (Captain)"
+
+/obj/item/storage/photo_album/CMO
+	name = "photo album (Chief Medical Officer)"
+
+/obj/item/storage/photo_album/QM
+	name = "photo album (Quartermaster)"
+
+/obj/item/storage/photo_album/CE
+	name = "photo album (Chief Engineer)"
diff --git a/modular_splurt/code/modules/photography/photos/photo.dm b/modular_splurt/code/modules/photography/photos/photo.dm
new file mode 100644
index 0000000000..3eb0f70752
--- /dev/null
+++ b/modular_splurt/code/modules/photography/photos/photo.dm
@@ -0,0 +1,3 @@
+/obj/item/photo/old
+	icon = 'modular_splurt/icons/obj/items_and_weapons.dmi'
+	icon_state = "photo_old"
diff --git a/modular_splurt/icons/mob/inhands/misc/books_lefthand.dmi b/modular_splurt/icons/mob/inhands/misc/books_lefthand.dmi
new file mode 100644
index 0000000000..cd59fe6d03
Binary files /dev/null and b/modular_splurt/icons/mob/inhands/misc/books_lefthand.dmi differ
diff --git a/modular_splurt/icons/mob/inhands/misc/books_righthand.dmi b/modular_splurt/icons/mob/inhands/misc/books_righthand.dmi
new file mode 100644
index 0000000000..a2fc3cc73b
Binary files /dev/null and b/modular_splurt/icons/mob/inhands/misc/books_righthand.dmi differ
diff --git a/modular_splurt/icons/obj/items_and_weapons.dmi b/modular_splurt/icons/obj/items_and_weapons.dmi
index 0dd0e88c6a..a5b3d02d5b 100644
Binary files a/modular_splurt/icons/obj/items_and_weapons.dmi and b/modular_splurt/icons/obj/items_and_weapons.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 06f5825477..90346a17f1 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -4714,6 +4714,8 @@
 #include "modular_splurt\code\modules\mob\living\simple_animal\hostile\megafauna\king_of_goats.dm"
 #include "modular_splurt\code\modules\mob\living\simple_animal\hostile\megafauna\sand.dm"
 #include "modular_splurt\code\modules\paperwork\pen.dm"
+#include "modular_splurt\code\modules\photography\photos\album.dm"
+#include "modular_splurt\code\modules\photography\photos\photo.dm"
 #include "modular_splurt\code\modules\power\cell.dm"
 #include "modular_splurt\code\modules\power\reactor\fluffed.dm"
 #include "modular_splurt\code\modules\projectiles\ammunition\ballistic\pistol.dm"