diff --git a/src/routes/api/registeredEvents/+server.ts b/src/routes/api/registeredEvents/+server.ts
index 7b9e510..d28a93e 100644
--- a/src/routes/api/registeredEvents/+server.ts
+++ b/src/routes/api/registeredEvents/+server.ts
@@ -1,8 +1,5 @@
-import {
-	globalEmitter,
-	getRegisteredEvents,
-	getRegisteredEventsWithPlayers
-} from '$lib/server/databaseManager';
+import { getRegisteredEventsWithPlayers } from '$lib/server/databaseManager';
+import { globalEmitter } from '$lib/server/globalEmitter';
 import { generateEndpoint } from '$lib/server/endpoint';
 
 export async function GET() {
@@ -10,16 +7,20 @@ export async function GET() {
 	const endpoint = generateEndpoint(async (enqueue) => {
 		// Get the all the events with the players seperated into brackets
 		let eventList = async () => {
+			// Get eventList with structure from database
 			let newEventList = await getRegisteredEventsWithPlayers();
+			console.log(newEventList);
+			// send to client
 			enqueue(newEventList);
 		};
 
 		// Send the eventList to the client when a connection is made
 		// TODO make it so that this only happens on an initial post request
 		eventList();
+		// When the data changes send an update to the client
 		globalEmitter.on('eventUpdate', eventList);
 
-		// Simply return the cleanup function here
+		// Return cleanup function to remove listener when it closes
 		return () => {
 			globalEmitter.off('eventUpdate', eventList);
 		};
@@ -28,10 +29,18 @@ export async function GET() {
 }
 
 export async function POST({ request }: any) {
+	// Decode body
 	let responseBody = await request.json();
-	let eventRequested = responseBody.eventId;
 
-	let eventList = await getRegisteredEventsWithPlayers(eventRequested);
-
-	return new Response(JSON.stringify(eventList));
+	// If there is no request then dont respond
+	if (!responseBody) {
+		return new Response('nuh uh');
+	} else {
+		// Get requested event
+		let eventRequested = responseBody.eventId;
+		// request eventList from database
+		let eventList = await getRegisteredEventsWithPlayers(eventRequested);
+		// return eventList to client
+		return new Response(JSON.stringify(eventList));
+	}
 }
diff --git a/src/routes/api/registeredPlayers/+server.ts b/src/routes/api/registeredPlayers/+server.ts
index c3d3fd1..e13bf2f 100644
--- a/src/routes/api/registeredPlayers/+server.ts
+++ b/src/routes/api/registeredPlayers/+server.ts
@@ -1,4 +1,5 @@
-import { globalEmitter, getAllRegisteredEventPlayers } from '$lib/server/databaseManager';
+import { getAllRegisteredEventPlayers } from '$lib/server/databaseManager';
+import { globalEmitter } from '$lib/server/globalEmitter';
 import { generateEndpoint } from '$lib/server/endpoint';
 
 // Expose post request
diff --git a/src/routes/api/teams/+server.ts b/src/routes/api/teams/+server.ts
index 0115f41..df1f227 100644
--- a/src/routes/api/teams/+server.ts
+++ b/src/routes/api/teams/+server.ts
@@ -1,4 +1,5 @@
-import { globalEmitter, getTeams } from '$lib/server/databaseManager';
+import { getTeams } from '$lib/server/databaseManager';
+import { globalEmitter } from '$lib/server/globalEmitter';
 import { generateEndpoint } from '$lib/server/endpoint';
 
 // Expose post request