diff --git a/workshop-two/main.py b/workshop-two/main.py
index 1e496d1..5a94e62 100644
--- a/workshop-two/main.py
+++ b/workshop-two/main.py
@@ -1,7 +1,5 @@
-#### This is a copy of what we did last week. To get up to date, check out the workshop-one folder.
-#### Completed code from workshop two will be uploaded here after the workshop.
-
-from fastapi import FastAPI, Path
+from fastapi import FastAPI, Path, Query, HTTPException
+from typing import Optional
 
 app = FastAPI()
 
@@ -9,7 +7,25 @@
     1: {
         "name": "Data Visualization",
         "professor": "Dana Willner",
-        "current_enr": 0,
+        "current_enr": 34,
+        "max_enr": 35,
+    },
+    2: {
+        "name": "Data Structures",
+        "professor": "Jim Deverick",
+        "current_enr": 35,
+        "max_enr": 35,
+    },
+    3: {
+        "name": "Computational Problem Solving",
+        "professor": "Timothy Davis",
+        "current_enr": 30,
+        "max_enr": 35,
+    },
+    4: {
+        "name": "Intro to Data Science",
+        "professor": "Dana Willner",
+        "current_enr": 36,
         "max_enr": 35,
     }
 }
@@ -23,3 +39,47 @@ async def root():
 @app.get("/course/{course_id}")
 async def get_course(course_id: int = Path(description="ID of the course to get", ge=1)):
     return COURSES[course_id]
+
+
+@app.put("/class/{course_id}/enroll")
+async def enroll(course_id: int):
+    course = COURSES[course_id]
+    if course["current_enr"] >= course["max_enr"]:
+        raise HTTPException(403, detail="Class is full")
+    course["current_enr"] += 1
+    enrolled = f"{course['current_enr']}/{course['max_enr']}"
+    return {"enrolled": enrolled}
+
+
+@app.get("/course-name")
+async def get_course(name: str):
+    for course_id in COURSES:
+        if COURSES[course_id]["name"] == name:
+            return COURSES[course_id]
+    raise HTTPException(404, detail="Course not found")
+
+
+@app.get("/list-courses")
+async def list_courses(available: Optional[bool] = Query(default=False, description="True to show only classes with "
+                                                                        "available seats. False to show all classes.")):
+    if available:
+        available_courses = {}
+        for course_id in COURSES:
+            if COURSES[course_id]["current_enr"] < COURSES[course_id]["max_enr"]:
+                available_courses[course_id] = COURSES[course_id]
+        return available_courses
+    return COURSES
+
+
+@app.get("/get-prof-courses/{prof}")
+async def get_prof_courses(prof: str, available: Optional[bool] = False):
+    prof_courses = {}
+    for course_id in COURSES:
+        if COURSES[course_id]["professor"] == prof:
+            if not available:
+                prof_courses[course_id] = COURSES[course_id]
+            if available and COURSES[course_id]["current_enr"] < COURSES[course_id]["max_enr"]:
+                prof_courses[course_id] = COURSES[course_id]
+    if len(prof_courses) == 0:
+        raise HTTPException(404, "No courses taught by this professor found")
+    return prof_courses
\ No newline at end of file