diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 7abe9e09..5af4e232 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -4,6 +4,6 @@ public class App
 {
     public static void main( String[] args )
     {
-        System.out.println( "Welcome to SENG302" );
+        System.out.println("");
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/seng302/Boat.java b/src/main/java/seng302/Boat.java
new file mode 100644
index 00000000..670aa04b
--- /dev/null
+++ b/src/main/java/seng302/Boat.java
@@ -0,0 +1,32 @@
+package seng302;
+
+/*
+	Represents a boat in the race.
+
+	@param teamName The name of the team sailing the boat
+*/
+public class Boat
+{
+	// The name of the team, this is also the name of the boat
+	private String teamName = null;
+
+	public Boat(String teamName) {
+		this.teamName = teamName;
+	}
+
+	/*
+		Returns the name of the team sailing the boat
+		@returns The name of the team 
+	*/
+	public String getTeamName(){
+		return this.teamName;
+	}
+
+	/*
+		Sets the name of the team sailing the boat
+		@param teamName The name of the team
+	*/
+	public void setTeamName(String teamName){
+		this.teamName = teamName;
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/seng302/BoatTest.java b/src/test/java/seng302/BoatTest.java
new file mode 100644
index 00000000..b8545319
--- /dev/null
+++ b/src/test/java/seng302/BoatTest.java
@@ -0,0 +1,26 @@
+package seng302;
+
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Unit test for the Team class.
+ */
+public class BoatTest 
+{
+    @Test
+    public void testBoatCreation()
+    {
+        Boat boat1 = new Boat("Team 1");
+        assertEquals(boat1.getTeamName(), "Team 1");
+    }
+
+    @Test
+    public void testChangeTeamName()
+    {
+    	Boat boat1 = new Boat("Team 1");
+    	boat1.setTeamName("Team 2");
+    	assertEquals(boat1.getTeamName(), "Team 2");
+    }
+}