diff --git a/chat-tests/cmd/serverFunc.go b/chat-tests/cmd/serverFunc.go
index 7d3abe8..2aed414 100644
--- a/chat-tests/cmd/serverFunc.go
+++ b/chat-tests/cmd/serverFunc.go
@@ -6,7 +6,6 @@ import (
 	"log"
 	"net"
 	"strings"
-	"time"
 )
 
 var (
@@ -22,11 +21,6 @@ type User struct {
 	IP       string
 }
 
-type Message struct {
-	Contents string
-	Date     time.Time
-}
-
 func (u User) CreateUser(usr string, ip string) User {
 	u.Username = usr
 	u.IP = ip
@@ -49,27 +43,63 @@ func Server() {
 	}
 }
 
-func getUsername(conn net.Conn) string {
-	conn.Write([]byte("What's your name?\n\r"))
-	conn.Write([]byte("Choice: "))
+func getUsername(conn net.Conn) (s string, err error) {
+	conn.Write([]byte("What's your name?\nChoice: "))
 	name, err := bufio.NewReader(conn).ReadString('\n')
 	if err != nil {
-		log.Fatalf("Error occurred getting username: %v\n", err)
+		return "", err
 	}
 	trimmedName := strings.TrimRight(name, "\n")
-	return trimmedName
+	return trimmedName, nil
 }
 
-func getUserInput() {
+func getUserInput(conn net.Conn) (s string, err error) {
+	message, err := bufio.NewReader(conn).ReadString('\n')
+	if err != nil {
+		return "", err
+	}
 
+	return message, nil
 }
 
 func handleConn(conn net.Conn) {
 	defer conn.Close()
+
+	//////////////////////////////////
+	// Get user information
+	//////////////////////////////////
+	userName, err := getUsername(conn)
+	if err != nil {
+		log.Printf("Error occurred getting username: %v\n", err)
+		return
+	}
+	userIP := getIP(conn)
+	//////////////////////////////////
+
 	newUserTemplate := new(User)
-	newUser := newUserTemplate.CreateUser(getUsername(conn), getIP(conn))
-	fmt.Printf("Received connection from %v at %v\n", newUser.Username, newUser.IP)
-	fmt.Fprintln(conn, "Hello buddy!")
+	newUser := newUserTemplate.CreateUser(userName, userIP)
+	joinMessage := fmt.Sprintf("%v has joined the chat!", newUser.Username)
+	fmt.Println(joinMessage)
+	conn.Write([]byte(joinMessage))
+
+	//////////////////////////////////
+	for {
+		message, err := getUserInput(conn)
+		if err != nil {
+			quitMessage := fmt.Sprintf("%v has disconnected!\n", newUser.Username)
+			fmt.Print(quitMessage)
+			if _, err := conn.Write([]byte(quitMessage)); err != nil {
+				log.Printf("Error happened sending disconnect message: %v", err)
+			}
+			return
+		}
+		finalMessage := fmt.Sprintf("[%v] %v: %v", newUser.IP, newUser.Username, strings.TrimRight(message, "\n"))
+		fmt.Printf("%v\n", finalMessage)
+		if _, err := conn.Write([]byte(finalMessage)); err != nil {
+			log.Printf("Error happened sending message: %v", err)
+		}
+	}
+	//////////////////////////////////
 }
 
 func getIP(conn net.Conn) (IP string) {