diff --git a/components/MessagePane.vue b/components/MessagePane.vue
index 848bef1..12f4991 100644
--- a/components/MessagePane.vue
+++ b/components/MessagePane.vue
@@ -3,7 +3,7 @@
 		<div class="w-full h-[calc(100%-60px)] overflow-y-scroll pb-1"
 			id="conversation-pane">
 			<div>
-				<div v-if="!conversation">
+				<div v-if="conversation.length === 0">
 					<p>No messages yet</p>
 				</div>
 				<div v-else
@@ -11,10 +11,23 @@
 					<div class="message-container">
 						<div>
 							<div class="message-sender-text">
-								<p :class="(message.userId == user.id) ? 'message-sender-you' : 'message-sender'">
-									{{ message.userId }}</p>
+								<p class="mb-1.5 font-semibold">
+									{{ message.creator.username }}
+								</p>
 								<p class="break-words max-w-full">{{ message.body }}</p>
 							</div>
+							<div>
+								<div v-for="invite in message.invites">
+									<div class="w-6/12 bg-[hsl(223,6.9%,19.8%)] p-4 rounded-md shadow-md mr-2">
+										<p class="text-sm font-semibold">You've been invited</p>
+										<span class="text-xl font-bold capitalize">{{ invite.server.name }}</span>
+										<div class="flex w-full justify-end">
+											<button @click="joinServer(invite)"
+												class="font-semibold rounded px-4 py-2 bg-green-700 hover:bg-green-600 transition-colors">Join</button>
+										</div>
+									</div>
+								</div>
+							</div>
 						</div>
 					</div>
 				</div>
@@ -22,7 +35,7 @@
 		</div>
 		<div class="conversation-input w-[calc(100vw-88px-240px)]">
 			<form @submit.prevent="sendMessage"
-				@keydown.enter="sendMessage"
+				@keydown.enter.exact.prevent="sendMessage"
 				class="relative px-4 w-full">
 				<div id="textbox"
 					class="px-4 rounded-md w-full h-[44px] bg-[hsl(218,calc(1*7.9%),27.3%)] placeholder:text-[hsl(218,calc(1*4.6%),46.9%)] flex flex-row">
@@ -55,52 +68,88 @@
 <script lang="ts">
 import { useGlobalStore } from '~/stores/store';
 import { io } from 'socket.io-client'
+import { IChannel, IInviteCode, IMessage } from '~/types';
 
 export default {
 	props: ['server'],
 	data() {
 		return {
-			user: useGlobalStore().user,
+			user: storeToRefs(useGlobalStore()).user,
 			messageContent: '',
-			conversation: this.server.messages
+			conversation: this.server.messages as IMessage[],
+			canSendNotifications: false
 		}
 	},
 	mounted() {
 		const route = useRoute()
 		const socket = io();
 
+		Notification.requestPermission().then((result) => {
+			const permission = (result === 'granted') ? true : false
+			this.canSendNotifications = permission
+		});
+
 		const conversationDiv = document.getElementById('conversation-pane');
-		if (!conversationDiv) throw new Error('wtf');
-		setTimeout(() => {
-			conversationDiv.scrollTop = conversationDiv.scrollHeight;
-		})
+		if (!conversationDiv) throw new Error('conversation div not found')
+		this.scrollToBottom()
 
-		socket.on('connect', () => {
-			// listen for messages from the server
-			socket.on(`message-${route.params.id}`, (ev) => {
-				const { message } = ev
-				console.log(message.userId, this.user.id, message, this.conversation)
-				if (message.userId == this.user.id) return;
+		socket.on(`message-${route.params.id}`, (ev) => {
+			const { message } = ev
+			if (message.creator.id === this.user.id) return;
+			if (!document.hasFocus()) {
+				new Notification(`Message from @${message.creator.username}`, { body: message.body, tag: message.serverId });
+			}
 
-				this.conversation.push(message)
+			this.conversation.push(message)
 
-				const lastElementChild = conversationDiv.children[0]?.lastElementChild
-				if (!lastElementChild) return;
+			const lastElementChild = conversationDiv.children[0]?.lastElementChild
+			if (!lastElementChild) return;
 
-				setTimeout(() => {
-					console.log(conversationDiv.scrollTop, conversationDiv.scrollHeight, conversationDiv.clientHeight, lastElementChild.clientHeight, (conversationDiv.scrollHeight - conversationDiv.clientHeight) - lastElementChild.clientHeight)
-					if (conversationDiv.scrollTop + 11.2 < (conversationDiv.scrollHeight - conversationDiv.clientHeight) - lastElementChild.clientHeight) return;
-					conversationDiv.scrollTop = conversationDiv.scrollHeight;
-				})
+			setTimeout(() => {
+				if (conversationDiv.scrollTop + 11.2 < (conversationDiv.scrollHeight - conversationDiv.clientHeight) - lastElementChild.clientHeight) return;
+				conversationDiv.scrollTop = conversationDiv.scrollHeight;
 			})
 		});
 	},
+	// updated() {
+	// 	const route = useRoute()
+	// 	const socket = io();
+
+	// 	const conversationDiv = document.getElementById('conversation-pane');
+	// 	if (!conversationDiv) throw new Error('conversation div not found')
+	// 	this.scrollToBottom()
+
+	// 	socket.removeAllListeners('connect')
+
+	// 	socket.on('connect', () => {
+	// 		// listen for messages from the server
+	// 		socket.on(`message-${route.params.id}`, (ev) => {
+	// 			const { message } = ev
+	// 			console.log(message.userId, this.user.id, message, this.conversation)
+	// 			if (message.userId == this.user.id) return;
+
+	// 			this.conversation.push(message)
+
+	// 			const lastElementChild = conversationDiv.children[0]?.lastElementChild
+	// 			if (!lastElementChild) return;
+
+	// 			setTimeout(() => {
+	// 				console.log(conversationDiv.scrollTop, conversationDiv.scrollHeight, conversationDiv.clientHeight, lastElementChild.clientHeight, (conversationDiv.scrollHeight - conversationDiv.clientHeight) - lastElementChild.clientHeight)
+	// 				if (conversationDiv.scrollTop + 11.2 < (conversationDiv.scrollHeight - conversationDiv.clientHeight) - lastElementChild.clientHeight) return;
+	// 				conversationDiv.scrollTop = conversationDiv.scrollHeight;
+	// 			})
+	// 		})
+	// 	});
+	// },
 	methods: {
 		async sendMessage() {
 			const route = useRoute()
 			if (!this.messageContent) return;
 
-			const { message } = await $fetch(`/api/channels/sendMessage`, { method: 'post', body: { body: this.messageContent, channelId: route.params.id } })
+			const message: IChannel = await $fetch(`/api/channels/sendMessage`, { method: 'post', body: { body: this.messageContent, channelId: route.params.id } })
+
+			if (!message) return;
+			if (this.conversation.includes(message)) return;
 
 			this.conversation.push(message)
 			this.messageContent = '';
@@ -110,6 +159,18 @@ export default {
 				conversationDiv.scrollTop = conversationDiv.scrollHeight;
 			})
 		},
+		async joinServer(invite: IInviteCode) {
+			const { server } = await $fetch('/api/guilds/joinGuild', { method: 'POST', body: { inviteId: invite.id } })
+			if (!server) return;
+			this.user.servers?.push(server)
+		},
+		scrollToBottom() {
+			const conversationDiv = document.getElementById('conversation-pane');
+			if (!conversationDiv) throw new Error('wtf');
+			setTimeout(() => {
+				conversationDiv.scrollTop = conversationDiv.scrollHeight;
+			})
+		}
 		// resizeTextarea() {
 		// 	const textArea = document.getElementById('messageBox')
 		// 	const textBox = document.getElementById('textBox')
diff --git a/components/Sidebar.vue b/components/Sidebar.vue
index 031ea2f..15ce067 100644
--- a/components/Sidebar.vue
+++ b/components/Sidebar.vue
@@ -15,25 +15,66 @@
 		<div class="w-full"
 			v-else>
 			<div class="flex p-4 border-b border-zinc-600/80">
-				<h4 class="text-lg font-semibold w-fit ">
-					{{ server.name }}
+				<h4 class="text-lg font-semibold grid gap-1 grid-cols-[1fr_28px] w-full">
+					<span>{{ server.name }}</span>
+					<button class="cursor-pointer p-1 hover:backdrop-brightness-110 transition-all">
+						<span class="h-fit w-[20px]">
+							<svg xmlns="http://www.w3.org/2000/svg"
+								width="20"
+								height="20"
+								viewBox="0 0 24 24">
+								<path fill="none"
+									stroke="currentColor"
+									stroke-linecap="round"
+									stroke-linejoin="round"
+									stroke-width="2"
+									d="m6 9l6 6l6-6" />
+							</svg>
+						</span>
+					</button>
 				</h4>
 			</div>
 			<div class="flex gap-y-1.5 px-1.5 mt-2 flex-col">
-				<div class="flex text-center hover:bg-zinc-600/70 px-2 py-1.5 w-full transition-colors rounded drop-shadow-sm"
+				<button @click="createInvite"
+					v-if="userIsOwnerOrAdmin">make invite</button>
+				<button
+					class="flex text-center hover:bg-zinc-600/70 px-2 py-1.5 w-full transition-colors rounded drop-shadow-sm gap-1/5 cursor-pointer"
 					v-for="channel in server.channels"
+					@click="openChannel(channel.id)"
 					:key="channel.id">
-					<svg width="24"
-						height="24"
-						viewBox="0 0 24 24">
-						<path fill="none"
-							stroke="currentColor"
-							stroke-linecap="round"
-							stroke-linejoin="round"
-							stroke-width="2"
-							d="M5 9h14M5 15h14M11 4L7 20M17 4l-4 16" />
-					</svg> {{ channel.name }}
-				</div>
+					<span>
+						<svg class="text-zinc-300 my-auto"
+							width="20"
+							height="20"
+							viewBox="0 0 24 24">
+							<path fill="none"
+								stroke="currentColor"
+								stroke-linecap="round"
+								stroke-linejoin="round"
+								stroke-width="2"
+								d="M5 9h14M5 15h14M11 4L7 20M17 4l-4 16" />
+						</svg>
+					</span>
+					<span>{{ channel.name }}</span>
+				</button>
+				<button v-if="userIsOwnerOrAdmin"
+					@click="openCreateChannelModel"
+					class="flex text-center hover:bg-zinc-600/70 px-2 py-1.5 w-full transition-colors rounded drop-shadow-sm cursor-pointer">
+					<span>
+						<svg xmlns="http://www.w3.org/2000/svg"
+							width="20"
+							height="20"
+							viewBox="0 0 24 24">
+							<path fill="none"
+								stroke="currentColor"
+								stroke-linecap="round"
+								stroke-linejoin="round"
+								stroke-width="2"
+								d="M12 5v14m-7-7h14" />
+						</svg>
+					</span>
+					<span>Add channel</span>
+				</button>
 			</div>
 		</div>
 
@@ -64,10 +105,72 @@
 			</div>
 		</div>
 	</div>
+
+	<div v-if="createChannelModelOpen"
+		class="absolute z-10 top-0 bottom-0 left-0 right-0">
+		<div class="bg-zinc-900/80 w-screen h-screen"
+			@click="createChannelModelOpen = false">
+		</div>
+		<div
+			class="p-4 z-20 absolute bg-zinc-800 shadow-md rounded-md -translate-x-1/2 -translate-y-1/2 top-1/2 left-1/2 text-white">
+			<h2 class="font-semibold text-xl">
+				Create a channel:
+			</h2>
+			<div>
+				<form @submit.prevent="createChannel"
+					class="w-3/5">
+					<input v-model="channelName"
+						type="text"
+						class="py-2 px-3 rounded-md mb-2 bg-zinc-700 shadow-md border border-zinc-700/80"
+						placeholder="Channel name" />
+					<input type="submit"
+						class="py-2 px-3 rounded-md bg-zinc-700 shadow-md border border-zinc-700/80" />
+				</form>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script lang="ts">
+import { IRole, IServer } from '~/types';
+
 export default {
+	data() {
+		return {
+			createChannelModelOpen: false,
+			channelName: '',
+			userIsOwnerOrAdmin: false
+		}
+	},
+	mounted() {
+		setTimeout(() => {
+			if (!this.server.roles) {
+				console.log(this.server)
+				throw new Error('server must be null');
+			}
+			this.userIsOwnerOrAdmin = this.server.roles.find((e: IRole) => e.users.some((el) => el.id === this.user.id)).owner ||
+				this.server.roles.find((e: IRole) => e.users.some((el) => el.id === this.user.id)).administrator
+		})
+	},
+	methods: {
+		openCreateChannelModel() {
+			this.createChannelModelOpen = true;
+		},
+		async createChannel() {
+			const channel = await $fetch(`/api/guilds/${this.server.id}/addChannel`, { method: 'POST', body: { channelName: this.channelName } })
+
+			this.server.channels.push(channel)
+			this.createChannelModelOpen = false;
+		},
+		openChannel(id: string) {
+			const router = useRouter()
+
+			router.push({ params: { id } })
+		},
+		async createInvite() {
+			const inviteCode = await $fetch(`/api/guilds/${this.server.id}/createInvite`, { method: 'POST' })
+		},
+	},
 	props: ['server', 'user']
 }
 </script>
\ No newline at end of file
diff --git a/layouts/default.vue b/layouts/default.vue
index f20f639..7eeb838 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -1,18 +1,25 @@
 <template>
-	<div v-if="user.id" class="flex h-screen max-h-screen text-white">
-		<Nav :user="user"/>
-		<Sidebar :server="activeServer"
-			:user="user" />
-		<div class="w-[calc(100vw-88px-240px)] h-full">
-			<slot />
+	<Suspense>
+		<div v-if="user.id"
+			class="flex h-screen max-h-screen text-white">
+			<Nav :user="user" />
+			<Sidebar :server="activeServer"
+				:user="user" />
+			<div class="w-[calc(100vw-88px-240px)] h-full">
+				<slot />
+			</div>
+
 		</div>
-	</div>
+		<template #fallback>
+			Loading...
+		</template>
+	</Suspense>
 </template>
   
 <script lang="ts">
 import { Nav, Sidebar } from '~/.nuxt/components'
 import { useGlobalStore } from '~/stores/store'
-import { IUser } from '~/types'
+import { SafeUser } from '~/types'
 
 export default {
 	data() {
@@ -26,7 +33,7 @@ export default {
 		const userStore = useGlobalStore()
 		const sessionToken = useCookie('sessionToken')
 		if (userStore.user.id === undefined && sessionToken.value) {
-			const user: IUser = await $fetch('/api/getCurrentUser')
+			const user: SafeUser = await $fetch('/api/getCurrentUser')
 
 			if (!user) return;
 
diff --git a/pages/channel/@me/[id].vue b/pages/channel/@me/[id].vue
index 21ad1b8..de572d2 100644
--- a/pages/channel/@me/[id].vue
+++ b/pages/channel/@me/[id].vue
@@ -2,6 +2,16 @@
 	<MessagePane :server="server" />
 </template>
 
+<script async setup lang="ts">
+const route = useRoute()
+
+const server: IChannel = await $fetch(`/api/channels/${route.params.id}`)
+if (server) {
+	useGlobalStore().addDM(server);
+	useGlobalStore().setActive('dms', server.id);
+}
+</script>
+
 <script lang="ts">
 import { useGlobalStore } from '~/stores/store'
 import { IChannel } from '~/types'
@@ -11,18 +21,6 @@ definePageMeta({
 })
 
 export default {
-	async setup() {
-		const route = useRoute()
-
-		const server: IChannel = await $fetch(`/api/channels/${route.params.id}`)
-		if (!server) return;
-		useGlobalStore().addDM(server);
-		useGlobalStore().setActive('dms', server.id);
-
-		return {
-			server,
-		}
-	},
 	async updated() {
 		if (!useGlobalStore().activeServer == this.server) useGlobalStore().setActive('dms', this.server.id)
 	},
diff --git a/pages/channel/[id].vue b/pages/channel/[id].vue
index d83529a..ffa2d93 100644
--- a/pages/channel/[id].vue
+++ b/pages/channel/[id].vue
@@ -7,7 +7,7 @@ const route = useRoute()
 
 const server: IChannel = await $fetch(`/api/channels/${route.params.id}`)
 
-const realServer = useGlobalStore().user.servers.filter((e) => e.channels.some((el) => el.id == route.params.id))[0]
+const realServer = useGlobalStore().user.servers?.filter((e) => e.channels.some((el) => el.id == route.params.id))[0]
 
 if (realServer) {
 	useGlobalStore().addServer(realServer);
diff --git a/pages/login.vue b/pages/login.vue
index f55dbfa..915a7a9 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -22,7 +22,7 @@
 
 <script lang="ts">
 import { useGlobalStore } from '~/stores/store'
-import { IUser } from '~/types';
+import { SafeUser } from '~/types';
 
 definePageMeta({
 	layout: 'clean'
@@ -43,7 +43,7 @@ export default {
 					username: this.username,
 					password: this.password
 				}
-			}) as { userId: string; token: string; user: IUser; }
+			}) as { userId: string; token: string; user: SafeUser; }
 
 			const userId = useCookie('userId')
 			userId.value = user.userId
diff --git a/pages/signup.vue b/pages/signup.vue
index 7eade9f..723e43c 100644
--- a/pages/signup.vue
+++ b/pages/signup.vue
@@ -32,7 +32,7 @@
 <script lang="ts">
 import { NuxtLink } from '~/.nuxt/components';
 import { useGlobalStore } from '~/stores/store'
-import { IUser } from '~/types';
+import { SafeUser } from '~/types';
 
 definePageMeta({
 	layout: 'clean'
@@ -55,7 +55,7 @@ export default {
 					email: this.email,
 					password: this.password
 				}
-			}) as { userId: string; token: string; user: IUser; }
+			}) as { userId: string; token: string; user: SafeUser; }
 
 			const userId = useCookie('userId')
 			userId.value = user.userId
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 11278e0..11cddaa 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -13,17 +13,29 @@ model User {
   username     String    @unique
   passwordhash String
   servers      Server[]
-  serverId     String?
   messages     Message[]
   session      Session[]
   channels     Channel[]
+  roles        Role[]
 }
 
 model Server {
-  id           String    @id @default(cuid())
+  id           String       @id @default(cuid())
   name         String
   participants User[]
   channels     Channel[]
+  roles        Role[]
+  InviteCode   InviteCode[]
+}
+
+model Role {
+  id            String  @id @default(cuid())
+  name          String
+  administrator Boolean @default(false)
+  owner         Boolean @default(false)
+  users         User[]
+  server        Server? @relation(fields: [serverId], references: [id])
+  serverId      String?
 }
 
 model Channel {
@@ -32,17 +44,29 @@ model Channel {
   server         Server?   @relation(fields: [serverId], references: [id])
   serverId       String?
   messages       Message[]
-  DM             Boolean?
+  DM             Boolean   @default(false)
   dmParticipants User[]
 }
 
 model Message {
-  id        String  @id @default(cuid())
+  id        String       @id @default(cuid())
   body      String
-  channel   Channel @relation(fields: [channelId], references: [id])
-  creator   User    @relation(fields: [userId], references: [id])
+  channel   Channel      @relation(fields: [channelId], references: [id])
+  creator   User         @relation(fields: [userId], references: [id])
   userId    String
   channelId String
+  invites   InviteCode[]
+}
+
+model InviteCode {
+  id         String    @id @default(cuid())
+  server     Server    @relation(fields: [serverId], references: [id])
+  expires    Boolean   @default(false)
+  expiryDate DateTime?
+  maxUses    Int       @default(0)
+  serverId   String
+  Message    Message?  @relation(fields: [messageId], references: [id])
+  messageId  String?
 }
 
 model Session {
diff --git a/server/api/channels/[id]/index.get.ts b/server/api/channels/[id]/index.get.ts
index 4b9520d..be1d340 100644
--- a/server/api/channels/[id]/index.get.ts
+++ b/server/api/channels/[id]/index.get.ts
@@ -1,4 +1,4 @@
-import { IChannel, IServer, IUser } from '../../../../types'
+import { IChannel, IServer, SafeUser } from '../../../../types'
 import { PrismaClient } from '@prisma/client'
 const prisma = new PrismaClient()
 
@@ -20,11 +20,47 @@ export default defineEventHandler(async (event) => {
 		where: {
 			id: event.context.params.id
 		},
-		include: {
-			messages: true,
-			dmParticipants: true
+		select: {
+			id: true,
+			name: true,
+			server: {
+				select: {
+					id: true
+				}
+			},
+			messages: {
+				select: {
+					id: true,
+					body: true,
+					creator: {
+						select: {
+							id: true,
+							username: true
+						}
+					},
+					invites: {
+						select: {
+							id: true, 
+							server: {
+								select: {
+									id: true,
+									name: true
+								}
+							}
+						}
+					}
+				}
+			},
+			DM: true,
+			dmParticipants: {
+				select: {
+					id: true,
+					username: true
+				}
+			},
+			serverId: true,
 		}
-	}) as IChannel
+	}) as IChannel | null;
 
 	if (!channel) {
 		event.node.res.statusCode = 404;
@@ -39,11 +75,12 @@ export default defineEventHandler(async (event) => {
 				id: channel.serverId
 			},
 			include: {
-				participants: true
+				participants: true,
+				roles: true
 			}
-		}) as IServer
+		}) as IServer | null;
 
-		const userInServer: Array<IUser> = server.participants.filter((e: IUser) => e.id === event.context.user.id)
+		const userInServer: Array<SafeUser> | undefined = server?.participants.filter((e: SafeUser) => e.id === event.context.user.id)
 
 		if (!userInServer) {
 			event.node.res.statusCode = 401;
diff --git a/server/api/channels/create.post.ts b/server/api/channels/create.post.ts
index 12ebaf1..d250466 100644
--- a/server/api/channels/create.post.ts
+++ b/server/api/channels/create.post.ts
@@ -42,13 +42,25 @@ export default defineEventHandler(async (event) => {
 						name: 'general',
 					},
 				]
+			},
+			roles: {
+				create: [
+					{
+						name: 'owner',
+						owner: true,
+						users: {
+							connect: [{ id: event.context.user.id }]
+						}
+					},
+				]
 			}
 		},
 		include: {
 			channels: true,
-			participants: true
+			participants: true,
+			roles: true
 		}
-	}) as IServer
+	}) as IServer;
 
 	return server
 })
\ No newline at end of file
diff --git a/server/api/channels/createDM.post.ts b/server/api/channels/createDM.post.ts
index e069d78..85d9dfa 100644
--- a/server/api/channels/createDM.post.ts
+++ b/server/api/channels/createDM.post.ts
@@ -1,4 +1,4 @@
-import { IChannel, IUser } from '~/types'
+import { IChannel, SafeUser } from '~/types'
 import { PrismaClient } from '@prisma/client'
 const prisma = new PrismaClient()
 
@@ -23,13 +23,13 @@ export default defineEventHandler(async (event) => {
 		where: {
 			id: partnerId
 		}
-	}) as IUser
+	}) as SafeUser | null;
 
 	const user = await prisma.user.findFirst({
 		where: {
 			id: event.context.user.id
 		}
-	}) as IUser
+	}) as SafeUser | null;
 
 	if (!partner) {
 		event.node.res.statusCode = 400;
@@ -38,6 +38,10 @@ export default defineEventHandler(async (event) => {
 		}
 	}
 
+	if (!user) {
+		throw new Error('user not found?')
+	}
+
 	const preExistingServer = await prisma.channel.findFirst({
 		where: {
 			name: `${user.id}-${partner.id}`,
diff --git a/server/api/channels/sendMessage.post.ts b/server/api/channels/sendMessage.post.ts
index 61428d7..d09b5c0 100644
--- a/server/api/channels/sendMessage.post.ts
+++ b/server/api/channels/sendMessage.post.ts
@@ -1,4 +1,4 @@
-import { IChannel, IServer, IUser, IMessage } from '~/types'
+import { IChannel, IServer, SafeUser, IMessage } from '~/types'
 import { Server } from 'socket.io'
 import { PrismaClient } from '@prisma/client'
 const prisma = new PrismaClient()
@@ -15,7 +15,7 @@ export default defineEventHandler(async (event) => {
 		}
 	}
 
-	const { body, channelId } = await readBody(event)
+	let { body, channelId } = await readBody(event)
 
 	if (!body || !channelId) {
 		event.node.res.statusCode = 400;
@@ -43,9 +43,9 @@ export default defineEventHandler(async (event) => {
 			}
 		}) as IServer
 
-		const userInServer: Array<IUser> = server.participants.filter((e) => e.id === event.context.user.id)
+		const userInServer: SafeUser | undefined = server.participants.find((e: SafeUser) => e.id === event.context.user.id)
 
-		if (userInServer.length > 0) {
+		if (!userInServer) {
 			event.node.res.statusCode = 401;
 			return {
 				message: 'You must be in the server to send a message.'
@@ -59,9 +59,9 @@ export default defineEventHandler(async (event) => {
 			}
 		}
 	} else {
-		const userInDM: Array<IUser> | undefined = channel.dmParticipants?.filter((e) => e.id === event.context.user.id)
+		const userInDM: SafeUser | undefined = channel.dmParticipants?.find((e) => e.id === event.context.user.id)
 
-		if (!userInDM || userInDM.length > 0) {
+		if (!userInDM) {
 			event.node.res.statusCode = 401;
 			return {
 				message: 'You must be in the DM to send a message.'
@@ -69,6 +69,21 @@ export default defineEventHandler(async (event) => {
 		}
 	}
 
+	const matches = body.match(/<&([a-z]|[0-9]){25}>/g);
+
+	let invites: { id: string; }[] = [];
+	if (matches) {
+		matches.forEach((e: string) => {
+			if (!e) return
+			const opBody = body;
+			body = body.split(e).join('')
+			if (opBody === body) return;
+			const id = e.split('<&')[1]?.split('>')[0];
+			if (!id) return;
+			invites.push({ id });
+		});
+	}
+
 	const message = await prisma.message.create({
 		data: {
 			body,
@@ -81,16 +96,34 @@ export default defineEventHandler(async (event) => {
 				connect: {
 					id: channelId
 				}
+			},
+			invites: {
+				connect: invites
 			}
 		},
-		include: {
-			creator: true
+		select: {
+			id: true,
+			body: true,
+			creator: {
+				select: {
+					id: true,
+					username: true,
+				}
+			},
+			invites: {
+				select: {
+					id: true,
+					server: true,
+					expires: true,
+					expiryDate: true,
+					maxUses: true
+				}
+			}
 		}
 	}) as IMessage
 
+
 	global.io.emit(`message-${channel.id}`, { message });
 
-	return {
-		message
-	}
+	return message
 })
\ No newline at end of file
diff --git a/server/api/getCurrentUser.get.ts b/server/api/getCurrentUser.get.ts
index 9fa6d31..b4b8b61 100644
--- a/server/api/getCurrentUser.get.ts
+++ b/server/api/getCurrentUser.get.ts
@@ -1,5 +1,5 @@
 import { PrismaClient } from '@prisma/client'
-import { IUser } from '../../types'
+import { SafeUser } from '../../types'
 const prisma = new PrismaClient()
 
 export default defineEventHandler(async (event) => {
@@ -42,13 +42,24 @@ export default defineEventHandler(async (event) => {
 							id: true,
 							username: true
 						}
+					},
+					roles: {
+						select: {
+							id: true,
+							name: true,
+							administrator: true,
+							owner: true,
+							users: {
+								select: {
+									id: true
+								}
+							}
+						}
 					}
 				},
 			},
 		}
-	}) as IUser
-
-	user.passwordhash = undefined;
+	}) as SafeUser | null;
 
 	return user
 })
\ No newline at end of file
diff --git a/server/api/guilds/[id]/addChannel.post.ts b/server/api/guilds/[id]/addChannel.post.ts
new file mode 100644
index 0000000..4e57932
--- /dev/null
+++ b/server/api/guilds/[id]/addChannel.post.ts
@@ -0,0 +1,67 @@
+import { IChannel, IServer, SafeUser } from '~/types'
+import { PrismaClient } from '@prisma/client'
+const prisma = new PrismaClient()
+
+export default defineEventHandler(async (event) => {
+	if (!event.context.user.authenticated) {
+		return {
+			message: 'You must be logged in to view a channel.'
+		}
+	}
+
+	if (!event.context.params.id) {
+		event.node.res.statusCode = 400;
+		return {
+			message: 'A serverId is required'
+		}
+	}
+
+	const { channelName } = await readBody(event)
+
+	const server = await prisma.server.findFirst({
+		where: {
+			id: event.context.params.id
+		},
+		include: {
+			participants: true,
+			channels: true,
+			roles: true
+		}
+	}) as IServer | null;
+
+	if (!server) {
+		event.node.res.statusCode = 404;
+		return {
+			message: `Server with id "${event.context.params.id}" not found`
+		}
+	}
+
+	const userInServer: Array<SafeUser> = server.participants.filter((e: SafeUser) => e.id === event.context.user.id)
+
+	if (!userInServer) {
+		event.node.res.statusCode = 401;
+		return {
+			message: `You must be in the server to access a channel in that server`
+		}
+	}
+
+	if (server.channels?.find((e) => e.name === channelName)) {
+		event.node.res.statusCode = 409;
+		return {
+			message: `Channel with name "${channelName}" already exists in server with id "event.context.user.id"`
+		}
+	}
+
+	const channel = await prisma.channel.create({
+		data: {
+			name: channelName,
+			server: {
+				connect: {
+					id: server.id
+				}
+			}
+		}
+	}) as IChannel
+
+	return channel
+})
\ No newline at end of file
diff --git a/server/api/guilds/[id]/createInvite.post.ts b/server/api/guilds/[id]/createInvite.post.ts
new file mode 100644
index 0000000..61bec8b
--- /dev/null
+++ b/server/api/guilds/[id]/createInvite.post.ts
@@ -0,0 +1,66 @@
+import { IChannel, IInviteCode, IServer, SafeUser } from '~/types'
+import { PrismaClient } from '@prisma/client'
+const prisma = new PrismaClient()
+
+export default defineEventHandler(async (event) => {
+	if (!event.context.user.authenticated) {
+		return {
+			message: 'You must be logged in to view a channel.'
+		}
+	}
+
+	if (!event.context.params.id) {
+		event.node.res.statusCode = 400;
+		return {
+			message: 'A serverId is required'
+		}
+	}
+
+	let body = await readBody(event)
+
+	let expires = false;
+	// if (body.expiryDate) {
+	// 	expires = true;
+	// 	body.expiryDate = new Date(body.expiryDate).getUTCDate()
+	// }
+
+	const server = await prisma.server.findFirst({
+		where: {
+			id: event.context.params.id
+		},
+		include: {
+			participants: true,
+			channels: true,
+			roles: true
+		}
+	}) as IServer | null;
+
+	if (!server) {
+		event.node.res.statusCode = 404;
+		return {
+			message: `Server with id "${event.context.params.id}" not found`
+		}
+	}
+
+	const userInServerAndPermited: Array<SafeUser> = server.participants.filter((e: SafeUser) => e.id === event.context.user.id && e.roles?.some((el) => el.administer === true || el.owner === false))
+
+	if (!userInServerAndPermited) {
+		event.node.res.statusCode = 401;
+		return {
+			message: `You must be in the server or an admin/owner of that server to make an invite code`
+		}
+	}
+
+	const inviteCode = await prisma.inviteCode.create({
+		data: {
+			server: {
+				connect: {
+					id: server.id
+				}
+			},
+			maxUses: 0
+		}
+	}) as IInviteCode
+
+	return inviteCode
+})
\ No newline at end of file
diff --git a/server/api/guilds/[id].get.ts b/server/api/guilds/[id]/index.get.ts
similarity index 92%
rename from server/api/guilds/[id].get.ts
rename to server/api/guilds/[id]/index.get.ts
index d6cf595..c15b7ee 100644
--- a/server/api/guilds/[id].get.ts
+++ b/server/api/guilds/[id]/index.get.ts
@@ -20,9 +20,10 @@ export default defineEventHandler(async (event) => {
 		},
 		include: {
 			participants: true,
-			channels: true
+			channels: true,
+			roles: true
 		}
-	}) as IServer
+	}) as IServer | null;
 
 	if (!server) {
 		event.node.res.statusCode = 404;
diff --git a/server/api/guilds/joinGuild.post.ts b/server/api/guilds/joinGuild.post.ts
new file mode 100644
index 0000000..c129b88
--- /dev/null
+++ b/server/api/guilds/joinGuild.post.ts
@@ -0,0 +1,65 @@
+import { IServer } from '~/types'
+import { PrismaClient } from '@prisma/client'
+const prisma = new PrismaClient()
+
+export default defineEventHandler(async (event) => {
+	if (!event.context.user.authenticated) return {
+		message: 'You must be logged in to view a channel.'
+	}
+
+	const { inviteId } = await readBody(event);
+
+	if (!inviteId) {
+		event.node.res.statusCode = 400;
+		return {
+			message: 'A inviteId is required'
+		}
+	}
+
+	const invite = await prisma.inviteCode.findFirst({
+		where: {
+			id: inviteId
+		},
+		include: {
+			server: true
+		}
+	})
+
+	if (!invite) {
+		event.node.res.statusCode = 404;
+		return {
+			message: `Invite with id "${inviteId}" not found`
+		}
+	}
+
+	// TODO: check if invite is valid
+
+	const server = await prisma.server.update({
+		where: {
+			id: invite.server.id
+		},
+		data: {
+			participants: {
+				connect: [
+					{ id: event.context.user.id }
+				]
+			}
+		},
+		include: {
+			participants: true,
+			channels: true,
+			roles: true
+		}
+	}) as IServer
+
+	if (!server) {
+		event.node.res.statusCode = 404;
+		return {
+			message: `Channel with id "${event.context.params.id}" not found`
+		}
+	}
+
+	return {
+		server
+	}
+})
\ No newline at end of file
diff --git a/server/api/signup.post.ts b/server/api/signup.post.ts
index 1d22528..3d36c52 100644
--- a/server/api/signup.post.ts
+++ b/server/api/signup.post.ts
@@ -1,7 +1,7 @@
 import bcryptjs from "bcryptjs";
 import { v4 as uuidv4 } from "uuid";
 import { PrismaClient } from '@prisma/client'
-import { IUser } from "../../types";
+import { SafeUser } from "~/types";
 const prisma = new PrismaClient()
 
 export default defineEventHandler(async (event) => {
@@ -25,7 +25,7 @@ export default defineEventHandler(async (event) => {
 				}
 			]
 		}
-	}) as IUser
+	}) as SafeUser
 
 	if (preExistingUser) {
 		event.node.res.statusCode = 409;
@@ -42,7 +42,7 @@ export default defineEventHandler(async (event) => {
 			passwordhash,
 			email: body.email
 		}
-	}) as IUser
+	}) as SafeUser
 
 	const token = uuidv4()
 
diff --git a/server/api/user/getServers.get.ts b/server/api/user/getServers.get.ts
deleted file mode 100644
index 29a7ba6..0000000
--- a/server/api/user/getServers.get.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { IUser } from '~/types'
-import { PrismaClient } from '@prisma/client'
-const prisma = new PrismaClient()
-
-export default defineEventHandler(async (event) => {
-	if (!event.context.user.authenticated) {
-		// event.node.res.statusCode = 401;
-		return {
-			message: "Unauthenticated"
-		}
-	}
-
-	const servers = await prisma.user.findFirst({
-		where: {
-			id: event.context.user.id
-		},
-		include: {
-			channels: true
-		}
-	}) as IUser
-
-	servers.passwordhash = undefined;
-
-	return servers
-})
\ No newline at end of file
diff --git a/stores/store.ts b/stores/store.ts
index d2264d6..4e59e63 100644
--- a/stores/store.ts
+++ b/stores/store.ts
@@ -1,12 +1,13 @@
-import { IUser, IServer, IChannel } from "../types";
+import { Ref } from "vue";
+import { SafeUser, IServer, IChannel } from "../types";
 
 export const useGlobalStore = defineStore('global', {
 	state: () => ({
-		activeServer: {} as IServer | Record<string, unknown>,
-		user: {} as IUser
+		activeServer: {} as IServer,
+		user: {} as SafeUser
 	}),
 	actions: {
-		setUser(user: IUser) {
+		setUser(user: SafeUser) {
 			this.user = user;
 		},
 		addServer(server: IServer) {
@@ -19,17 +20,25 @@ export const useGlobalStore = defineStore('global', {
 		},
 		setActive(type: string, serverId: string) {
 			if (serverId === '@me') {
-				this.activeServer = {}
+				this.activeServer = {} as IServer
 				return;
 			}
+			console.log(this.activeServer)
 			if (!this.user.channels || !this.user.servers) return;
 
 			type = (type === 'dm') ? 'channels' : 'servers'
 
 			if (type !== 'channels' && type !== 'servers') return;
 
-			const searchableArray: IChannel[] | IServer[] = this["user"][type]
-			this.activeServer = searchableArray.find((e: IServer | IChannel) => e.id === serverId)
+			const searchableArray: IChannel[] | IServer[] | undefined = this["user"][type]
+			if (!searchableArray) return;
+			const activeServer = searchableArray.find((e: IServer | IChannel) => e.id === serverId)
+			console.log(searchableArray, this["user"], activeServer)
+
+			if (!activeServer) return;
+
+			this.activeServer = activeServer
+			console.log(this.activeServer)
 		},
 	},
 })
diff --git a/types/index.ts b/types/index.ts
index af3b1b7..ae28728 100644
--- a/types/index.ts
+++ b/types/index.ts
@@ -2,25 +2,29 @@ export interface IUser {
 	id: string;
 	email: string;
 	username: string;
-	passwordhash: string | undefined;
-	servers: Array<IServer>;
-	serverId?: string;
-	channels: Array<IChannel>;
+	passwordhash: string;
+	servers?: Array<IServer>;
+	channels?: Array<IChannel>;
+	roles?: Array<IRole>;
 }
 
+export type SafeUser = Omit<Omit<IUser, 'passwordhash'>, 'email'>
+
 export interface IServer {
 	id: string;
 	name: string;
-	channels: Array<IChannel>;
+	channels?: Array<IChannel>;
 	participants: Array<IUser>;
+	roles?: Array<IRole>;
+	inviteCode?: Array<IInviteCode>;
 }
 
 export interface IChannel {
 	id: string;
 	name: string;
 	server?: IServer;
-	messages: Array<unknown>
-	DM?: boolean;
+	messages?: Array<IMessage>
+	DM: boolean;
 	dmParticipants?: Array<IUser>;
 	serverId: string;
 }
@@ -28,8 +32,30 @@ export interface IChannel {
 export interface IMessage {
 	id: string;
 	body: string;
-	creator: IUser;
-	channel: IChannel;
+	creator: SafeUser;
+	channel?: IChannel;
 	userId: string;
 	channelId: string;
+	invites?: IInviteCode[];
+}
+
+export interface IInviteCode {
+	id: string;
+	server: IServer;
+	expires: boolean;
+	expiryDate: Date;
+	maxUses: number;
+	serverId: string;
+	Message: IMessage;
+	messageId: string;
+}
+
+export interface IRole {
+	id: string;
+	name: string;
+	administer: boolean;
+	owner: boolean;
+	users: IUser[];
+	server?: IServer;
+	serverId?: string;
 }
\ No newline at end of file