diff --git a/react-chat/src/App.tsx b/react-chat/src/App.tsx
index c153168..876d597 100644
--- a/react-chat/src/App.tsx
+++ b/react-chat/src/App.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react'
+import {useEffect, useMemo, useState} from 'react'
 import { AnyDocumentId, DocHandle, Repo } from '@automerge/automerge-repo';
 import { BrowserWebSocketClientAdapter } from '@automerge/automerge-repo-network-websocket';
 import { IndexedDBStorageAdapter } from '@automerge/automerge-repo-storage-indexeddb';
@@ -8,6 +8,7 @@ import { Chat } from './components/Chat'
 import { UserSettings } from './components/UserSettings'
 import { LoginRequiredError, createClient, createVerifier } from '@featherscloud/auth'
 import { ChatDocument, CloudAuthUser, Message, User, sha256 } from './utils';
+import {ChatContext, ChatContextValue} from "./components/ChatContext.tsx";
 
 // Initialize Feathers Cloud Auth
 const appId = import.meta.env.VITE_CLOUD_APP_ID as string;
@@ -48,20 +49,6 @@ function App() {
     }
   }
 
-  // Create a new Message
-  const createMessage = (text: string) => {
-    if (handle && user) {
-      handle.change(doc => {
-        doc.messages.push({
-          id: crypto.randomUUID(),
-          text: text,
-          createdAt: Date.now(),
-          userId: user.id
-        })
-      })
-    }
-  }
-
   // Initialize the application
   const init = async () => {
     try {
@@ -91,6 +78,8 @@ function App() {
     }
   }
 
+  const contextValue = useMemo<ChatContextValue>(()=>({user, handle}), [user, handle]);
+
   useEffect(() => {
     init()
   }, [])
@@ -98,7 +87,7 @@ function App() {
   if (handle?.isReady()) {
     return user === null
       ? <UserSettings onSubmit={createUser} />
-      : <Chat messages={messages} user={user} users={users} createMessage={createMessage} />
+      : <ChatContext.Provider value={contextValue}><Chat messages={messages} users={users} /></ChatContext.Provider>
   }
 }
 
diff --git a/react-chat/src/components/Chat.tsx b/react-chat/src/components/Chat.tsx
index 09a7d76..7216a49 100644
--- a/react-chat/src/components/Chat.tsx
+++ b/react-chat/src/components/Chat.tsx
@@ -1,15 +1,31 @@
 import { Message, User } from "../utils";
 import { CreateMessage } from "./CreateMessage"
 import { MessageList } from "./MessageList"
+import {useChat} from "./ChatContext.tsx";
+import {useCallback} from "react";
 
 export type ChatOptions = {
-  user: User;
   users: User[];
   messages: Message[];
-  createMessage: (text: string) => void;
 };
 
-export const Chat = ({ messages, user, users, createMessage }: ChatOptions) => {
+export const Chat = ({ messages, users }: ChatOptions) => {
+  const {user, handle} = useChat();
+
+  // Create a new Message
+  const createMessage = useCallback((text: string) => {
+    if (handle && user) {
+      handle.change(doc => {
+        doc.messages.push({
+          id: crypto.randomUUID(),
+          text: text,
+          createdAt: Date.now(),
+          userId: user.id
+        })
+      })
+    }
+  }, [user, handle])
+
   return <div className="drawer drawer-mobile"><input id="drawer-left" type="checkbox" className="drawer-toggle" />
     <div className="drawer-content flex flex-col">
       <div className="navbar w-full">
@@ -34,7 +50,7 @@ export const Chat = ({ messages, user, users, createMessage }: ChatOptions) => {
       <ul className="menu user-list compact p-2 w-60 bg-base-300 text-base-content">
         <li className="menu-title"><span>Users</span></li>
         {users.map(current => <li className="user" key={current.id}>
-          <a className={ user.id === current.id ? 'text-secondary font-bold' : ''}>
+          <a className={ user!.id === current.id ? 'text-secondary font-bold' : ''}>
             <div className="avatar indicator">
               <div className="w-6 rounded"><img src={current.avatar} alt={current.username!} /></div>
             </div><span>{current.username}</span>
diff --git a/react-chat/src/components/ChatContext.tsx b/react-chat/src/components/ChatContext.tsx
new file mode 100644
index 0000000..041786c
--- /dev/null
+++ b/react-chat/src/components/ChatContext.tsx
@@ -0,0 +1,9 @@
+import {createContext, useContext} from "react";
+import {DocHandle} from "@automerge/automerge-repo";
+import {ChatDocument, User} from "../utils.ts";
+
+export type ChatContextValue = {handle: DocHandle<ChatDocument> | null; user: User | null};
+
+export const ChatContext = createContext<ChatContextValue>({handle: null, user: null});
+
+export const useChat = ()=>useContext(ChatContext);
diff --git a/react-chat/src/components/MessageList.tsx b/react-chat/src/components/MessageList.tsx
index 232dd87..0175488 100644
--- a/react-chat/src/components/MessageList.tsx
+++ b/react-chat/src/components/MessageList.tsx
@@ -1,9 +1,10 @@
-import { useEffect, useRef } from "react"
-import { Message, User } from "../utils"
+import {useCallback, useEffect, useRef, MouseEvent} from "react"
+import {Message as MessageType, User} from "../utils"
+import {useChat} from "./ChatContext.tsx";
 
 type MessageListProps = {
-  messages: Message[]
-  users: User[]
+  users: User[];
+  messages: MessageType[];
 }
 
 const formatDate = (timestamp: number) =>
@@ -12,8 +13,70 @@ const formatDate = (timestamp: number) =>
     dateStyle: 'medium'
   }).format(new Date(timestamp))
 
-export const MessageList = ({ messages, users }: MessageListProps) => {
-  const messagesEndRef = useRef(null)
+const Reaction = ({emoji, total, onClick}: { emoji: string, total: number, onClick: (event: MouseEvent) => void }) => {
+  return <button className='reaction' onClick={onClick} data-emoji={emoji}>
+    <span>{emoji}</span>
+    <span>{total}</span>
+  </button>;
+}
+
+const Message = ({message, author}: { message: MessageType; author?: User; }) => {
+  const {user, handle} = useChat();
+  const handleAddReactClick = useCallback(() => {
+    handle?.change((chat) => {
+      const writeableMessage = chat.messages.find(({id}) => id === message.id);
+      if (writeableMessage) {
+        writeableMessage.reactions ??= {};
+        writeableMessage.reactions['✨'] ??= {};
+        writeableMessage.reactions['✨'][user!.id] = true;
+      }
+    });
+  }, [handle, message, user]);
+  const handleRemoveReactClick = useCallback((event: MouseEvent) => {
+    const emoji = ((event.target as HTMLElement).closest('[data-emoji]') as HTMLButtonElement)?.getAttribute('data-emoji');
+    console.log('[handle remove]', emoji);
+    if (emoji && handle) {
+      handle?.change((chat) => {
+        const writeableMessage = chat.messages.find(({id}) => id === message.id);
+        if (writeableMessage) {
+          writeableMessage.reactions ??= {};
+          writeableMessage.reactions[emoji] ??= {};
+          delete writeableMessage.reactions[emoji][user!.id];
+          if(Object.keys(writeableMessage.reactions[emoji]).length < 1){
+            delete writeableMessage.reactions[emoji];
+          }
+        }
+      });
+    }
+  }, [handle, message, user]);
+  const reactions = Object.entries(message.reactions ?? {}).reduce((acc: Record<string, number>, [emoji, peanutGallery]) => {
+    acc[emoji] = Object.keys(peanutGallery).length;
+    return acc;
+  }, {});
+  return <div className="chat chat-start py-2" key={message.id}>
+    <div className="chat-image avatar">
+      <div className="w-10 rounded-full">
+        <img src={author?.avatar}/>
+      </div>
+    </div>
+    <div className="chat-header pb-1">
+      {author?.username}
+      <time className="text-xs opacity-50">{formatDate(message.createdAt)}</time>
+    </div>
+    <div className="chat-bubble relative">
+      {message.text}
+      <div className='absolute bottom-[-2rem] flex flex-wrap gap-1'>
+        {Object.entries(reactions).map(([emoji, total]) => <Reaction key={emoji} emoji={emoji} total={total}
+                                                                     onClick={handleRemoveReactClick}/>)}
+        {/*TODO(thure): Add emoji picker*/}
+        <button className='reaction' onClick={handleAddReactClick}>+</button>
+      </div>
+    </div>
+  </div>;
+}
+
+export const MessageList = ({messages, users}: MessageListProps) => {
+  const messagesEndRef = useRef<HTMLDivElement | null>(null)
   const usersById = users.reduce((acc, user) => {
     acc[user.id] = user
     return acc
@@ -21,22 +84,11 @@ export const MessageList = ({ messages, users }: MessageListProps) => {
 
   // Scroll to bottom when messages change
   useEffect(() => {
-    (messagesEndRef.current as any)?.scrollIntoView({ behavior: "smooth" })
+    messagesEndRef.current?.scrollIntoView({behavior: "smooth"})
   })
 
   return <div id="chat" className="h-full overflow-y-auto px-3">
-    {messages.map(message => <div className="chat chat-start py-2" key={message.id}>
-      <div className="chat-image avatar">
-        <div className="w-10 rounded-full">
-          <img src={usersById[message.userId]?.avatar} />
-        </div>
-      </div>
-      <div className="chat-header pb-1">
-        {usersById[message.userId]?.username}
-        <time className="text-xs opacity-50">{formatDate(message.createdAt)}</time>
-      </div>
-      <div className="chat-bubble">{message.text}</div>
-    </div>)}
-    <div ref={messagesEndRef} />
+    {messages.map(message => <Message key={message.id} message={message} author={usersById[message.userId]}/>)}
+    <div ref={messagesEndRef}/>
   </div>
 }
\ No newline at end of file
diff --git a/react-chat/src/index.css b/react-chat/src/index.css
index 6119ad9..987a90a 100644
--- a/react-chat/src/index.css
+++ b/react-chat/src/index.css
@@ -66,3 +66,11 @@ button:focus-visible {
     background-color: #f9f9f9;
   }
 }
+
+.reaction {
+  font-size: .8rem;
+  display: block;
+  padding: 0rem .5rem .125rem .25rem;
+  border-radius: 999px;
+  background: #0f172a;
+}
diff --git a/react-chat/src/utils.ts b/react-chat/src/utils.ts
index b18fdca..ebcca52 100644
--- a/react-chat/src/utils.ts
+++ b/react-chat/src/utils.ts
@@ -9,11 +9,14 @@ export type User = {
   avatar: string;
 };
 
+export type Reactions = Record<string, Record<string, true>>;
+
 export type Message = {
   id: string;
   text: string;
   createdAt: number;
   userId: string;
+  reactions?: Reactions;
 };
 
 export type ChatDocument = {