diff --git a/code/WorkInProgress/AI_Visibility.dm b/code/WorkInProgress/AI_Visibility.dm
index a0bec430f49..32cd0350e22 100644
--- a/code/WorkInProgress/AI_Visibility.dm
+++ b/code/WorkInProgress/AI_Visibility.dm
@@ -275,6 +275,8 @@ var/datum/cameranet/cameranet = new()
 /mob/living/silicon/ai/New()
 	..()
 	eyeobj.ai = src
+	spawn(20)
+		freelook()
 
 /mob/living/silicon/ai/death(gibbed)
 	if(client && client.eye == eyeobj)
@@ -293,6 +295,7 @@ var/datum/cameranet/cameranet = new()
 		client.eye = src
 		for(var/datum/camerachunk/c in eyeobj.visibleCameraChunks)
 			c.remove(eyeobj)
+		freelook()
 	else
 		if(!eyeobj)	//if it got deleted somehow (like an admin trying to fix things <.<')
 			eyeobj = new()
@@ -300,6 +303,7 @@ var/datum/cameranet/cameranet = new()
 		eyeobj.loc = loc
 		cameranet.visibility(eyeobj)
 		cameraFollow = null
+
 /mob/aiEye/Move()
 	. = ..()
 	if(.)
@@ -360,4 +364,8 @@ var/datum/cameranet/cameranet = new()
 		if(!C.status || C.stat == 2)
 			continue
 		return 1
-	return 0
\ No newline at end of file
+	return 0
+
+/mob/living/silicon/ai/switchCamera(atom/A)
+	eyeobj.loc = A.loc
+	return
\ No newline at end of file