diff --git a/main.go b/main.go
index 320ce9a..3280c11 100644
--- a/main.go
+++ b/main.go
@@ -44,6 +44,12 @@ func main() {
 	mux.HandleFunc("/auth/twitch/callback", h.Callback)
 	mux.HandleFunc("/logout", h.Logout)
 
+	mux.HandleFunc("/create-hackathon", h.CreateHackathon)
+	mux.HandleFunc("/hackathon/create", h.ParseHackthonForm)
+
+	mux.HandleFunc("/hackathon/{provider}", h.ListHackathonsByProvider)
+	mux.HandleFunc("/hackathon/{provider}/{user}", h.ListHackathonsByUser)
+
 	// pages route
 	mux.HandleFunc("/", h.Home)
 	mux.Handle("/welcome", handlers.RequireAuth(http.HandlerFunc(h.Welcome)))
diff --git a/templates/create-hackathon.html b/templates/create-hackathon.html
new file mode 100644
index 0000000..68d6952
--- /dev/null
+++ b/templates/create-hackathon.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>HackHost - Hackathon Platform</title>
+    <link rel="stylesheet" href="/static/css/style.css">
+</head>
+
+<body>
+    HI
+    <form method="post" action="/hackathon/create">
+        <input type="text" name="hackathonName" id="hackathonName" placeholder="Hackathon name" />
+        <textarea name="description" placeholder="Description"></textarea>
+        <input type="date" id="startDate" name="startDate">
+        <input type="date" id="endDate" name="endDate">
+
+        <button type="submit">Submit</button>
+    </form>
+</body>
+
+</html>
diff --git a/templates/hackathons.html b/templates/hackathons.html
new file mode 100644
index 0000000..020620a
--- /dev/null
+++ b/templates/hackathons.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>HackHost - Hackathon Platform</title>
+    <link rel="stylesheet" href="/static/css/style.css">
+</head>
+
+<body>
+    {{if .Hackathons}}
+    <table border="1">
+        <tr>
+            <th>ID</th>
+            <th>Name</th>
+            <th>Owner ID</th>
+            <th>Start Date</th>
+            <th>End Date</th>
+            <th>Provider</th>
+        </tr>
+        {{range .Hackathons}}
+        <tr>
+            <td>{{.Id}}</td>
+            <td>{{.HackathonName}}</td>
+            <td>{{.OwnerId}}</td>
+            <td>{{.StartDate}}</td>
+            <td>{{.EndDate}}</td>
+            <td>{{.Provider}}</td>
+        </tr>
+        {{end}}
+    </table>
+    {{else}}
+    <p>No hackathons found for provider: {{.Provider}}</p>
+    {{end}}
+</body>
+
+</html>
diff --git a/templates/index.html b/templates/index.html
index 16cae14..0cd0078 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -26,8 +26,8 @@
 
     <section id="home" class="hero">
         <div class="container">
-            <h1>Host and Participate in Amazing Hackathons</h1>
-            <p>A platform for developers to showcase their skills, collaborate, and win prizes.</p>
+            <h1>Code as a Community</h1>
+            <p>A platform for deveopers to showcase their skills.</p>
             <a href="#submit" class="btn">Join a hackathon today!</a>
         </div>
     </section>
diff --git a/todo.md b/todo.md
index 9540288..714bddb 100644
--- a/todo.md
+++ b/todo.md
@@ -1,19 +1,42 @@
 userid user_type            username   capabilities provider       avatar_url 
 1      hacker|repo|streamer codegirl   1,2,3,4,5    twitch|github  ...
-
+2       ....                nutshadedude 1,2,3      twitch          ...
 capability_id capability_name
 1             join_hacka
 2             
 
-hackathon_id hackathon_name owner_id
+hackathon_id hackathon_name description owner_id
 1            something cool 1
 
 hackathon_cap
 id capabilities_id hackathon_id
 1     
 
+groups
+id    user_id_starter
+1       1
+
+
+participants
+p_id  u
+
+hackathon_group
+id  group_id  hackathon_id
+
 participants
 userid, hackathon_id
 
+
+SELECT h.*, p.* FROM hackathons h, participants p INNER JOIN participants ON participants.hackathon_id WHERE h.id = p.hackathon_tch
+
 # ACTUAL TODOS
 - handle refreshing tokens
+
+/hackathon/twitch
+/hackathon/twitch/codegirl007
+/hackathon/twitch/codegirl007/hackathon-name
+
+/groups/hackathon/create
+/groups
+
+SELECT * FROM hackathon WHERE provider = ? AND owner_id = ? INNER JOIN users id ON hackathons.owner_id = users.id;
