diff --git a/.replit b/.replit
index 5ebcdce9..ce0a7216 100644
--- a/.replit
+++ b/.replit
@@ -1,4 +1,4 @@
-run = "npm run dev:host"
+run = "npm run format && npm run dev:host"
 onBoot = "npm install"
 
 [packager]
diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md
new file mode 100644
index 00000000..386d5484
--- /dev/null
+++ b/DOCUMENTATION.md
@@ -0,0 +1,27 @@
+# API Documentation
+
+## GET /api/entries.json
+
+Search for entries
+
+### Params
+
+All parameters should of course be encoded in the request url as URL query string parameters.
+
+Note: If there are no parameters, it will fetch all entries.
+
+- **`tags`**: CSV (comma seperated values) of tags to search for. Eg: "web,programming language,discord user"
+- **`query`**: String to search for in article titles and content.
+- **`visible`**: Boolean (true/false) of whether to show regular (non unlisted or hidden), 'visible' entries. Defaults to true.
+- **`unlisted`**: Boolean (true/false) of whether to show unlisted entries. Some users may not have the proper permissions to view these entries. Defaults to false.
+- **`hidden`**: Boolean (true/false) of whether to show hidden entries. Some users may not have the proper permissions to view these entries. Defaults to false.
+- **`limit`**: Integer of how many entries it should return. Defaults to all.
+- **`skip`**: Integer of how many entries should be skipped (useful for pagination). Defaults to 0 (skip none).
+
+## POST /api/entries.json
+
+Creates entry. Probably should not try and do this programatically.
+
+## GET /api/random.json
+
+Get random entry.
diff --git a/README.md b/README.md
index 6bb442cd..30556be8 100644
--- a/README.md
+++ b/README.md
@@ -10,3 +10,7 @@ Repldex is the unofficial community-editable encyclopedia of user created entrie
 # Contributing
 
 See [CONTRIBUTING.md](CONTRIBUTING.md)
+
+# API Docs
+
+Looking for the Repldex api documentation? Go to [DOCUMENTATION.md](DOCUMENTATION.md)
diff --git a/src/lib/EntryPreview.svelte b/src/lib/EntryPreview.svelte
index c9ae4149..64d0c333 100644
--- a/src/lib/EntryPreview.svelte
+++ b/src/lib/EntryPreview.svelte
@@ -1,21 +1,52 @@
 <script lang="ts">
 	import type { Entry } from './database/entries'
-
+	import { browser } from '$app/env'
 	export let entry: Entry
 
 	import * as markdown from './markdown'
 	import { getEntryViewUrl } from './utils'
+
+	const setTagSearch = (tag: string) => {
+		if (browser) {
+			let search_bar = document.getElementById('search') as HTMLInputElement
+			search_bar.value = 'tags:' + tag.tag.replaceAll(' ', '_')
+			//search_bar.oninput()
+			search_bar.dispatchEvent(new InputEvent('input'))
+		}
+	}
 </script>
 
-<a class="entry-preview-container" href={getEntryViewUrl(entry)}>
+<div
+	class="entry-preview-container"
+	on:click={() => {
+		window.location.href = getEntryViewUrl(entry)
+	}}
+>
 	{#if entry.visibility === 'unlisted'}
 		<p class="visibility-warning">Unlisted</p>
 	{:else if entry.visibility === 'hidden'}
 		<p class="visibility-warning">Hidden</p>
 	{/if}
-	<h2 class="entry-preview-title">{entry.title}</h2>
+
+	<a href={getEntryViewUrl(entry)} class="entry-preview-title-link"
+		><h2 class="entry-preview-title">{entry.title}</h2></a
+	>
 	<p class="entry-preview-content">{@html markdown.render(entry.content)}</p>
-</a>
+
+	{#if entry.tags}
+		{#each entry.tags as tag}
+			<span
+				class="tag"
+				on:click={event => {
+					setTagSearch({ tag })
+					event.cancelBubble = true
+				}}
+			>
+				{tag}
+			</span>
+		{/each}
+	{/if}
+</div>
 
 <style>
 	.entry-preview-container {
@@ -25,7 +56,9 @@
 		display: block;
 		color: inherit;
 		text-decoration: none;
+		cursor: pointer;
 	}
+
 	.entry-preview-content {
 		display: -webkit-box;
 		-webkit-box-orient: vertical;
@@ -34,9 +67,14 @@
 		margin: 0;
 	}
 
+	.entry-preview-title-link {
+		text-decoration: inherit;
+		color: inherit;
+	}
+
 	.entry-preview-title {
 		margin-top: 0;
-		margin-bottom: 0.25em;
+		margin-bottom: 0.15em;
 	}
 
 	.visibility-warning {
@@ -48,6 +86,21 @@
 		position: relative;
 		top: -0.5em;
 		right: -0.5em;
+		margin-left: 5px;
+		box-shadow: 0 0 0.5em #0004;
+		letter-spacing: 0.05ch;
+	}
+
+	.tag {
+		float: right;
+		border: 2px solid var(--alternate-background-color);
+		padding: 0.2rem;
+		border-radius: 0.2rem;
+		margin: 0;
+		position: relative;
+		bottom: -0.5em;
+		margin-left: 5px;
+		right: -0.5em;
 		box-shadow: 0 0 0.5em #0004;
 		letter-spacing: 0.05ch;
 	}
diff --git a/src/lib/database/entries.ts b/src/lib/database/entries.ts
index 690b0087..fc844b45 100644
--- a/src/lib/database/entries.ts
+++ b/src/lib/database/entries.ts
@@ -11,6 +11,7 @@ export interface Entry {
 	visibility: Visibility
 	createdAt: Date
 	editedAt: Date
+	tags: string[]
 }
 
 let triedCreatingSearchIndex = false
@@ -34,6 +35,7 @@ interface FilterEntriesOptions {
 interface FetchEntriesOptions extends FilterEntriesOptions {
 	limit: number
 	skip: number
+	tags?: string[]
 }
 
 /**
@@ -44,6 +46,7 @@ export async function fetchEntries(options: FetchEntriesOptions): Promise<Entry[
 	const searchQuery = options.query
 	const skip = options.skip
 	const limit = options.limit
+	const tags = options.tags
 
 	const searchFilter: Filter<ReplaceIdWithUuid<Entry>> = {
 		visibility: {
@@ -54,7 +57,13 @@ export async function fetchEntries(options: FetchEntriesOptions): Promise<Entry[
 			].filter(Boolean) as Visibility[],
 		},
 	}
+
 	if (searchQuery) searchFilter.$text = { $search: searchQuery }
+	if (tags) {
+		searchFilter.tags = {
+			$all: tags,
+		}
+	}
 
 	const foundEntries = await collection
 		.find(searchFilter)
diff --git a/src/lib/discord/scripts/registerCommands.ts b/src/lib/discord/scripts/registerCommands.ts
index d23e231d..8ed666d2 100644
--- a/src/lib/discord/scripts/registerCommands.ts
+++ b/src/lib/discord/scripts/registerCommands.ts
@@ -14,22 +14,19 @@ import fetch from 'node-fetch'
 async function registerCommands() {
 	const bulkUpdate: RESTPutAPIApplicationCommandsJSONBody = commands.map(c => c.json)
 
-	console.log(JSON.stringify(bulkUpdate, null, 2))
-
-	const json = await fetch(GLOBAL_COMMAND_API_URL, {
+	await fetch(GLOBAL_COMMAND_API_URL, {
 		method: 'PUT',
 		headers: {
 			'Content-Type': 'application/json',
 			'Authorization': `Bot ${process.env.DISCORD_TOKEN}`,
 		},
 		body: JSON.stringify(bulkUpdate),
-	}).then(res => res.json())
+	})
 
-	console.log(JSON.stringify(json, null, 2))
-	console.log('Registered commands :)')
 	console.log(
-		'Please note that you only have to run this whenever the syntax of a command is changed, i.e. not on every code change.'
+		'Registered commands, Please note that you only have to run this whenever the syntax of a command is changed, i.e. not on every code change. :)'
 	)
+	process.exit(0)
 }
 
 registerCommands()
diff --git a/src/routes/api/entries.json.ts b/src/routes/api/entries.json.ts
index dd5bdf5c..952b318b 100644
--- a/src/routes/api/entries.json.ts
+++ b/src/routes/api/entries.json.ts
@@ -10,6 +10,12 @@ export const get: RequestHandler = async req => {
 	const showVisible = req.url.searchParams.get('visible') !== 'false'
 	const showUnlisted = req.url.searchParams.get('unlisted') === 'true'
 	const showHidden = req.url.searchParams.get('hidden') === 'true'
+	const tags = req.url.searchParams
+		.get('tags')
+		?.split(',')
+		?.map(tag => tag.trim())
+		?.filter(tag => tag.length > 0)
+	const query = req.url.searchParams.get('query')
 
 	const user = req.locals.user ? await fetchUser({ id: req.locals.user.id }) : null
 
@@ -29,6 +35,8 @@ export const get: RequestHandler = async req => {
 		visible: showVisible,
 		unlisted: showUnlisted,
 		hidden: showHidden,
+		tags: tags,
+		query: query ? query : undefined,
 	})
 
 	return {
@@ -66,6 +74,7 @@ export const post: RequestHandler = async req => {
 	// the typings for req.body are wrong, so we have to do `as any`
 	const entryContent = body.content
 	const entryTitle = body.title
+	const tags = body.tags
 
 	const slug = createSlug(entryTitle)
 
@@ -105,6 +114,7 @@ export const post: RequestHandler = async req => {
 		title: entryTitle,
 		slug,
 		visibility,
+		tags,
 	})
 
 	if (entry) {
diff --git a/src/routes/api/entry/[slug].json.ts b/src/routes/api/entry/[slug].json.ts
index 7d133a51..8da8f130 100644
--- a/src/routes/api/entry/[slug].json.ts
+++ b/src/routes/api/entry/[slug].json.ts
@@ -32,6 +32,7 @@ export const put: RequestHandler = async req => {
 	const title = (body.title as string) ?? null
 	const entryId = (body.id as string) ?? null
 	const visibility = (body.visibility as Visibility) ?? null
+	const tags = (body.tags as string[]) ?? null
 
 	const basicUser = req.locals.user
 
@@ -111,6 +112,7 @@ export const put: RequestHandler = async req => {
 		slug,
 		title,
 		visibility,
+		tags,
 	})
 	await createHistoryItem({
 		entryId: createUuid(entry.id),
diff --git a/src/routes/edit/[slug].svelte b/src/routes/edit/[slug].svelte
index 50576f11..0e044953 100644
--- a/src/routes/edit/[slug].svelte
+++ b/src/routes/edit/[slug].svelte
@@ -38,6 +38,7 @@
 
 	let entryTitle: string = entry.title
 	let entryContent: string = entry.content
+	let entryTags: string = (entry.tags ?? []).join(',')
 	let visibility: Visibility = entry.visibility
 
 	// automatically update the page title
@@ -46,7 +47,10 @@
 	async function submitEntry() {
 		// make a put request to /api/entry/<id>.json
 		// if successful, redirect to /entry/<slug>
-
+		entryTags = entryTags
+			.split(',')
+			.map(tag => tag.trim())
+			.filter(tag => tag.length > 0)
 		const response: Entry | { error: string } = await fetch(`/api/entry/${entry.id}.json`, {
 			method: 'PUT',
 			headers: {
@@ -56,6 +60,7 @@
 				id: entry.id,
 				title: entryTitle,
 				content: entryContent,
+				tags: entryTags,
 				visibility: visibility,
 			}),
 		}).then(response => response.json())
@@ -97,6 +102,12 @@
 			<MarkdownEditor bind:value={entryContent} />
 		</Labelled>
 
+		<div class="tags">
+			<Labelled text="Tags (seperated with commas)">
+				<TextInput bind:value={entryTags} />
+			</Labelled>
+		</div>
+
 		<button on:click={submitEntry}>Save</button>
 	</div>
 </div>
@@ -112,6 +123,11 @@
 		margin-bottom: 1rem;
 	}
 
+	.tags {
+		margin-top: 1rem;
+		margin-bottom: 1rem;
+	}
+
 	/* vertically align */
 	#editor-container {
 		display: grid;
diff --git a/src/routes/edit/index.svelte b/src/routes/edit/index.svelte
index 800a6283..d264884e 100644
--- a/src/routes/edit/index.svelte
+++ b/src/routes/edit/index.svelte
@@ -34,6 +34,7 @@
 
 	let entryTitle = ''
 	let entryContent = ''
+	let entryTags = ''
 
 	// automatically update the page title
 	let pageTitle = 'Create entry'
@@ -41,9 +42,11 @@
 		pageTitle = entryTitle.length ? `New entry "${entryTitle}"` : 'New entry'
 	}
 
-	async function submitEntry() {
+	const submitEntry = async () => {
 		// make a post/put request to /api/entries.json
 		// if successful, redirect to /entry/<slug>
+		entryTags = entryTags.split(',')
+		if (entryTags.length == 1 && entryTags[0] == '') entryTags = []
 
 		const response: Entry | { error: string } = await fetch('/api/entries.json', {
 			method: 'POST',
@@ -53,6 +56,7 @@
 			body: JSON.stringify({
 				title: entryTitle,
 				content: entryContent,
+				tags: entryTags,
 				visibility,
 			}),
 		}).then(response => response.json())
@@ -89,11 +93,18 @@
 				<TextInput bind:value={entryTitle} />
 			</Labelled>
 		</div>
+
 		<Labelled text="Content">
 			<MarkdownEditor bind:value={entryContent} />
 		</Labelled>
 
-		<button on:click={submitEntry}>Submit</button>
+		<div class="tags">
+			<Labelled text="Tags (seperated with commas)">
+				<TextInput bind:value={entryTags} />
+			</Labelled>
+		</div>
+
+		<button on:click={submitEntry}>Save</button>
 	</div>
 </div>
 
@@ -108,11 +119,17 @@
 		margin-bottom: 1rem;
 	}
 
+	.tags {
+		margin-top: 1rem;
+		margin-bottom: 1rem;
+	}
+
 	/* vertically align */
 	#editor-container {
 		display: grid;
 		align-items: center;
 		height: 100vh;
+		margin-top: 1.5rem;
 	}
 
 	button {
diff --git a/src/routes/entry/[slug].svelte b/src/routes/entry/[slug].svelte
index 29f80afe..fc006569 100644
--- a/src/routes/entry/[slug].svelte
+++ b/src/routes/entry/[slug].svelte
@@ -47,9 +47,16 @@
 {:else if entry.visibility === 'hidden'}
 	<p class="visibility-warning">Hidden</p>
 {/if}
+
 <h1>{entry.title}</h1>
 <article>{@html markdown.render(entry.content)}</article>
 
+{#if entry.tags}
+	{#each entry.tags as tag}
+		<span class="tag">{tag}</span>
+	{/each}
+{/if}
+
 <style>
 	.back-button {
 		position: absolute;
@@ -74,6 +81,18 @@
 		border-radius: 0.2rem;
 		margin: 0;
 		margin-top: 3rem;
+		margin-left: 5px;
+		box-shadow: 0 0 0.5em #0004;
+	}
+
+	.tag {
+		float: left;
+		border: 2px solid var(--alternate-background-color);
+		padding: 0.2rem;
+		border-radius: 0.2rem;
+		margin: 0;
+		margin-top: 3rem;
+		margin-right: 5px;
 		box-shadow: 0 0 0.5em #0004;
 	}
 
@@ -92,9 +111,11 @@
 		h1 {
 			padding-top: 2rem;
 		}
+
 		.entry-nav-links {
 			margin-top: 2rem;
 		}
+
 		.entry-nav-links {
 			left: 1em;
 			margin-right: 0;
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index 7c34100f..bc939b40 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -31,15 +31,39 @@
 	let showVisible = true
 	let showUnlisted = false
 	let showHidden = false
+	let searchValue = ''
 
 	let fetchIndex = 0
 
-	async function updateEntries() {
+	const updateEntries = async () => {
 		fetchIndex += 1
 		let thisFetchIndex = fetchIndex
-		const res = await fetch(
-			`/api/entries.json?visible=${showVisible}&unlisted=${showUnlisted}&hidden=${showHidden}`
-		)
+
+		let tags: string
+		let query: string
+
+		if (!searchValue) {
+			query = undefined
+		} else {
+			let all = searchValue.split(' ')
+			query = all.filter(word => !word.startsWith('tags:')).join(' ')
+
+			if (searchValue.includes('tags:')) {
+				let tags_raw = all.filter(word => word.startsWith('tags:'))[0]
+				tags = tags_raw.slice(5).replaceAll('_', '%20')
+			}
+		}
+
+		let url = `/api/entries.json?visible=${showVisible}&unlisted=${showUnlisted}&hidden=${showHidden}`
+
+		if (query) {
+			url += `&query=${query}`
+		}
+		if (tags) {
+			url += `&tags=${tags}`
+		}
+
+		const res = await fetch(url)
 		const newEntries = await res.json()
 
 		if (thisFetchIndex === fetchIndex) entries = newEntries
@@ -47,6 +71,7 @@
 
 	$: {
 		;[showVisible, showUnlisted, showHidden]
+
 		if (browser) {
 			updateEntries()
 		}
@@ -84,10 +109,25 @@
 	</div>
 {/if}
 
+<div class="searchbar-container">
+	<input
+		type="text"
+		id="search"
+		class="search"
+		placeholder="Search"
+		bind:value={searchValue}
+		on:input={updateEntries}
+	/>
+</div>
+
 <div class="entry-list">
-	{#each entries as entry}
-		<EntryPreview {entry} />
-	{/each}
+	{#if entries.length !== 0}
+		{#each entries as entry}
+			<EntryPreview {entry} />
+		{/each}
+	{:else}
+		<p>No entries with query found</p>
+	{/if}
 </div>
 
 <style>
@@ -118,6 +158,7 @@
 		top: 0.15em;
 	}
 
+	/* Visibility */
 	.visibility-toggles-container {
 		width: 100%;
 		display: block;
@@ -125,6 +166,7 @@
 		display: flex;
 		justify-content: flex-end;
 	}
+
 	.visibility-toggles {
 		border-radius: 0.5em;
 		white-space: normal;
@@ -136,9 +178,11 @@
 		box-shadow: 0 0 0.5em #0004;
 		letter-spacing: 0.05ch;
 	}
+
 	.visibility-toggles input[type='checkbox'] {
 		display: none;
 	}
+
 	.visibility-toggles > label > span {
 		background-color: var(--background-color);
 		padding: 0.5rem;
@@ -148,6 +192,7 @@
 		display: inline-block;
 		transition: background-color 100ms;
 	}
+
 	.visibility-toggles input[type='checkbox']:checked ~ span {
 		background-color: var(--alternate-background-color);
 		color: var(--bright-text-color);
@@ -156,10 +201,29 @@
 	.visibility-toggles label {
 		border-right: 2px solid var(--background-color);
 	}
+
 	.visibility-toggles label:last-of-type {
 		border-right: none;
 	}
 
+	/* Search */
+	.searchbar-container {
+		width: 100%;
+		display: block;
+		height: fit-content;
+		display: flex;
+		justify-content: flex-end;
+		margin-bottom: 25px;
+	}
+
+	.search {
+		outline: none;
+		border-radius: 5px;
+		padding: 10px;
+		font-family: var(--font);
+		font-weight: bold;
+	}
+
 	/* move the logo to the left if the screen is less than 500px */
 	@media (max-width: 500px) {
 		h1 {
@@ -171,12 +235,18 @@
 
 		.entry-list {
 			padding-top: 5em;
+			justify-content: center;
 		}
 
 		.visibility-toggles-container {
 			position: relative;
 			top: 5em;
 		}
+
+		.searchbar-container {
+			position: relative;
+			top: 5em;
+		}
 	}
 
 	/* hide the title text if the screen is less than 340px */
@@ -184,5 +254,17 @@
 		.title-text {
 			display: none;
 		}
+
+		.visibility-toggles-container {
+			justify-content: center;
+		}
+
+		.searchbar-container {
+			justify-content: center;
+		}
+
+		.search {
+			width: 80%;
+		}
 	}
 </style>
diff --git a/src/routes/login.ts b/src/routes/login.ts
index 75bf2c42..79bf4959 100644
--- a/src/routes/login.ts
+++ b/src/routes/login.ts
@@ -52,7 +52,6 @@ export const get: RequestHandler = async req => {
 	}).then(res => res.json())
 
 	if (!discordUserData.id) {
-		console.log(discordUserData)
 		throw new Error('Failed to get user data from Discord')
 	}
 
@@ -64,6 +63,7 @@ export const get: RequestHandler = async req => {
 	})
 
 	let sessionId: string
+
 	if (existingRepldexUser) {
 		// the user has a repldex account, create a new session for them
 		sessionId = await createSession({