diff --git a/src/main/java/com/volmit/iris/object/IrisEntity.java b/src/main/java/com/volmit/iris/object/IrisEntity.java
index df83c95e2..eaa5b6b64 100644
--- a/src/main/java/com/volmit/iris/object/IrisEntity.java
+++ b/src/main/java/com/volmit/iris/object/IrisEntity.java
@@ -272,6 +272,11 @@ public class IrisEntity extends IrisRegistrant
 			return Iris.linkMythicMobs.spawn(getMythicalType(), at);
 		}
 
+		if(isCitizens())
+		{
+			return Iris.linkCitizens.spawn(getType(), at);
+		}
+
 		return at.getWorld().spawnEntity(at, getType());
 	}
 
@@ -279,4 +284,9 @@ public class IrisEntity extends IrisRegistrant
 	{
 		return Iris.linkMythicMobs.supported() && !getMythicalType().trim().isEmpty();
 	}
+
+	public boolean isCitizens()
+	{
+		return Iris.linkCitizens.supported(); // TODO Need to determine how to tell if entity needs to be Citizen NPC (eg. getCitizensType())
+	}
 }