diff --git a/app/http.go b/app/http.go
index c22a0a3..fac2882 100644
--- a/app/http.go
+++ b/app/http.go
@@ -2,9 +2,11 @@ package main
 
 import (
 	"fmt"
+	"log"
 	"net"
 	"regexp"
 	"strconv"
+	"strings"
 )
 
 const (
@@ -61,16 +63,6 @@ type Routes struct {
 	regexpRoutes []RegexRoute
 }
 
-// func createHandler(routes Routes) func(conn net.Conn) {
-// 	return func(conn net.Conn) {
-
-// 		for _, route := range(routes.stringRoutes){
-
-// 		}
-
-// 	}
-// }
-
 func Respond(conn net.Conn, response Response) {
 	fmt.Fprintf(conn, "%s %d %s%s", response.Version, response.Code.Code, response.Code.Message, HTTPDelimiter)
 	bodySize := 0
@@ -94,6 +86,45 @@ func Respond(conn net.Conn, response Response) {
 			conn.Write(response.BodyRaw)
 		}
 	}
-
-	// fmt.Fprintf(conn, "HTTP/1.1 %d %s%s%s", response.Code, response.Message, HTTPDelimiter, HTTPDelimiter)
+}
+
+func parseRequest(conn net.Conn) (Request, bool) {
+	buffer := make([]byte, 1024)
+	n, err := conn.Read(buffer)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	contents := string(buffer[:n])
+	parts := strings.Split(contents, HTTPDelimiter)
+	request := Request{}
+	isBody := false
+	for i, part := range parts {
+		if i == 0 {
+			head := strings.Split(part, " ")
+			if len(head) != 3 {
+				return Request{}, false
+			}
+			request.Method = head[0]
+			request.Path = head[1]
+			request.Version = head[2]
+			continue
+		}
+
+		if isBody {
+			request.Body = part
+			break
+		}
+
+		// Headers
+		if part == "" {
+			isBody = true
+			continue
+		}
+		h := strings.SplitN(part, ": ", 2)
+		header := Header{Name: h[0], Value: h[1]}
+		request.Headers = append(request.Headers, header)
+	}
+
+	return request, true
 }
diff --git a/app/server.go b/app/server.go
index 31115e0..0411b8f 100644
--- a/app/server.go
+++ b/app/server.go
@@ -2,53 +2,20 @@ package main
 
 import (
 	"fmt"
-	"log"
 	"net"
 	"os"
 	"regexp"
-	"strings"
 )
 
 func handleConnection(conn net.Conn, routes Routes) {
 	defer conn.Close()
 
-	buffer := make([]byte, 1024)
-	n, err := conn.Read(buffer)
-	if err != nil {
-		log.Fatal(err)
+	request, ok := parseRequest(conn)
+	if !ok {
+		Respond(conn, Response{Version: "HTTP/1.1", Code: BadRequest})
+		return
 	}
 
-	contents := string(buffer[:n])
-	parts := strings.Split(contents, HTTPDelimiter)
-	request := Request{}
-	isBody := false
-	for i, part := range parts {
-		if i == 0 {
-			head := strings.Split(part, " ")
-			if len(head) != 3 {
-				Respond(conn, Response{Version: "HTTP/1.1", Code: BadRequest})
-				return
-			}
-			request.Method = head[0]
-			request.Path = head[1]
-			request.Version = head[2]
-			continue
-		}
-
-		if isBody {
-			request.Body = part
-			break
-		}
-
-		// Headers
-		if part == "" {
-			isBody = true
-			continue
-		}
-		h := strings.SplitN(part, ": ", 2)
-		header := Header{Name: h[0], Value: h[1]}
-		request.Headers = append(request.Headers, header)
-	}
 	fmt.Println(request)
 
 	for _, route := range routes.stringRoutes {