diff --git a/.gitmodules b/.gitmodules
index 4952699..07c9386 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "templates/home"]
 	path = templates/home
 	url = https://github.com/wpi-acm/hack-wpi-static.git
+[submodule "goathacks/templates/home"]
+	path = goathacks/templates/home
+	url = https://github.com/WPI-ACM/Hack-WPI-Static
diff --git a/goathacks/__init__.py b/goathacks/__init__.py
index 7b58686..fe3373b 100644
--- a/goathacks/__init__.py
+++ b/goathacks/__init__.py
@@ -1,4 +1,4 @@
-from flask import Flask, render_template
+from flask import Flask, render_template, send_from_directory
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate
 from flask_login import LoginManager
@@ -47,7 +47,12 @@ def create_app():
     # Homepage
     @app.route("/")
     def index():
-        return render_template("index.html")
+        return render_template("home/index.html")
+
+    # homepage assets
+    @app.route("/assets/<path:path>")
+    def assets(path):
+        return send_from_directory('templates/home/assets', path)
 
     return app
 
diff --git a/goathacks/templates/home b/goathacks/templates/home
new file mode 160000
index 0000000..d24d276
--- /dev/null
+++ b/goathacks/templates/home
@@ -0,0 +1 @@
+Subproject commit d24d276382d7b50f5a2bdbdc661567ab102f7971