diff --git a/build/test-results/TEST-IntegratedTest.xml b/build/test-results/TEST-IntegratedTest.xml
diff --git a/build/test-results/binary/test/output.bin b/build/test-results/binary/test/output.bin
diff --git a/build/test-results/binary/test/output.bin.idx b/build/test-results/binary/test/output.bin.idx
diff --git a/build/test-results/binary/test/results.bin b/build/test-results/binary/test/results.bin
diff --git a/build/tmp/test/jar_extract_1773513228369710980_tmp b/build/tmp/test/jar_extract_1773513228369710980_tmp
diff --git a/build/tmp/test/jar_extract_2597820071955008493_tmp b/build/tmp/test/jar_extract_2597820071955008493_tmp
diff --git a/build/tmp/test/jar_extract_2640644561934453063_tmp b/build/tmp/test/jar_extract_2640644561934453063_tmp
diff --git a/build/tmp/test/jar_extract_2729959629877606157_tmp b/build/tmp/test/jar_extract_2729959629877606157_tmp
diff --git a/build/tmp/test/jar_extract_3062315382075124163_tmp b/build/tmp/test/jar_extract_3062315382075124163_tmp
diff --git a/build/tmp/test/jar_extract_4081802285560524678_tmp b/build/tmp/test/jar_extract_4081802285560524678_tmp
diff --git a/build/tmp/test/jar_extract_4088688631946498693_tmp b/build/tmp/test/jar_extract_4088688631946498693_tmp
diff --git a/build/tmp/test/jar_extract_4090501056757037052_tmp b/build/tmp/test/jar_extract_4090501056757037052_tmp
diff --git a/build/tmp/test/jar_extract_4354095525867540065_tmp b/build/tmp/test/jar_extract_4354095525867540065_tmp
diff --git a/build/tmp/test/jar_extract_5120311721946071599_tmp b/build/tmp/test/jar_extract_5120311721946071599_tmp
diff --git a/build/tmp/test/jar_extract_6108652588443730020_tmp b/build/tmp/test/jar_extract_6108652588443730020_tmp
diff --git a/build/tmp/test/jar_extract_6357753820327439027_tmp b/build/tmp/test/jar_extract_6357753820327439027_tmp
diff --git a/build/tmp/test/jar_extract_7566638351560915471_tmp b/build/tmp/test/jar_extract_7566638351560915471_tmp
diff --git a/build/tmp/test/jar_extract_8090276552183899162_tmp b/build/tmp/test/jar_extract_8090276552183899162_tmp
diff --git a/src/main/java/App.java b/src/main/java/App.java
@@ -22,18 +22,26 @@ public static void main(String[] args){
 
     post("/albums", (request, response) -> {
     HashMap<String, Object> model = new HashMap<String, Object>();
-    ArrayList<CDOrganizer> albums = request.session().attribute("albums");
+    ArrayList<CD> albums = request.session().attribute("albums");
 
       if (albums == null){
-        albums = new ArrayList<CDOrganizer>();
+        albums = new ArrayList<CD>();
         request.session().attribute("albums", albums);
       }
 
-    String description = request.queryParams("description");
-    CDOrganizer newCD = new CDOrganizer(description);
+    String title = request.queryParams("title");
+    String artist = request.queryParams("artist");
+    CD newCD = new CD(title, artist);
     //request.session().attribute("album", newCD);
     albums.add(newCD);
 
+    post("/artists", ()
+
+
+
+
+
+
     model.put("template", "templates/succces.vtl");
     return new ModelAndView(model, layout);
   }, new VelocityTemplateEngine());

diff --git a/src/main/java/CD.java b/src/main/java/CD.java
@@ -0,0 +1,18 @@
+public class CD{
+  private String mAlbumName;
+  private String mArtistName;
+
+  public CD(String albumName, String artistName){
+    mAlbumName = albumName;
+    mArtistName = artistName;
+  }
+
+  public String getAlbumTitle() {
+    return mAlbumName;
+  }
+
+  public String getArtistName(){
+    return mArtistName;
+  }
+
+}
diff --git a/src/main/java/CDOrganizer.java b/src/main/java/CDOrganizer.java
@@ -1,11 +1,16 @@
+import java.util.ArrayList;
+
 public class CDOrganizer{
-  private String mAlbumName;
+  private ArrayList<CD> mCds;
+
+  public CDOrganizer(){
+    mCds = new ArrayList<CD>();
 
-  public CDOrganizer(String albumName){
-    mAlbumName = albumName;
   }
 
-  public String getAlbumTitle() {
-    return mAlbumName;
+
+  public void addCD(CD newCD) {
+  //  CD newCD = CD(albumName, artistName);
+    mCds.add(newCD);
   }
 }
diff --git a/src/main/resources/templates/index.vtl b/src/main/resources/templates/index.vtl
@@ -1,18 +1,19 @@
 <h1>CD Organizer</h1>
 Current albums:
 
-<ul>
+<!-- <ul>
 #foreach ($album in $albums)
-  <li>$album.getAlbumTitle()</li>
+  <li>$album.getAlbumTitle() by $album.getArtistName()</li>
 #end
-</ul>
+</ul> -->
 
 <hr>
 <p>Add a new Album:</p>
 
 <form action="/albums" method="post">
-  <label for="description">Album Name</label>
-  <input id="description" name="description" type="text">
+  <label for="title">Album Name</label>
+  <input id="title" name="title" type="text">
 
   <button type="submit" class="btn btn-default">Add Album</button>
+
 </form>
diff --git a/src/main/resources/templates/succces.vtl b/src/main/resources/templates/succces.vtl
@@ -1,5 +1,15 @@
 <h1>Success!</h1>
 
 Your album has been saved.
+Your albums are
 
-<a href="/">Go Back</a>
+<p>Enter the Artist.</p>
+
+<form action="/artists" method="post">
+  <label for="description">Enter Artists name</label>
+  <input id="description" name="description" type="text">
+
+  <button type="submit" class="btn btn-default">Artist Name</button>
+</form>
+
+<!-- //<a href="/">Go Back</a> -->
diff --git a/src/main/resources/templates/success2.vtl b/src/main/resources/templates/success2.vtl
@@ -0,0 +1,13 @@
+<h1>Success!</h1>
+
+Your artist has been saved.
+
+
+<p>Enter the Artist.</p>
+
+<form action="/artists" method="post">
+  <label for="description">Enter Artists name</label>
+  <input id="description" name="description" type="text">
+
+  <button type="submit" class="btn btn-default">Artist Name</button>
+</form>
diff --git a/src/test/java/CDOrganizerTest.java b/src/test/java/CDOrganizerTest.java
@@ -10,14 +10,32 @@
 public class CDOrganizerTest{
 
   @Test
-  public void cDOrganizer_instantiatesCorrectly_true(){
-    CDOrganizer myCD = new CDOrganizer("To Pimp a Butterfly");
-    assertEquals(true, myCD instanceof CDOrganizer);
+  public void cD_instantiatesCorrectly_true(){
+    CD myCD = new CD("To Pimp a Butterfly", "exampleArtist");
+    assertEquals(true, myCD instanceof CD);
   }
 
   @Test
-  public void cDOrganizer_instantsWithalbumtitle_true(){
-    CDOrganizer myCD = new CDOrganizer("To Pimp a Butterfly");
+  public void cD_instantsWithalbumtitle_true(){
+    CD myCD = new CD("To Pimp a Butterfly", "exampleArtist");
     assertEquals("To Pimp a Butterfly", myCD.getAlbumTitle());
   }
+
+  @Test
+  public void cD_instantiatesWithArtistName_true(){
+    CD myCD = new CD("ExampleAlbum", "ExampleArtist");
+    assertEquals("ExampleArtist", myCD.getArtistName());
+  }
+
+  // @Test
+  // public void artists_instantiatesCorretly_true(){
+  //   Artists myArtist = new Artists("Backstreet Boys");
+  //   assertEquals(true, myArtist instanceof Artists);
+  // }
+  //
+  // @Test
+  // public void artists_instantiatesWithArtistName_true(){
+  //   Artists myArtist = new Artists("Backstreet Boys");
+  //   assertEquals("Backstreet Boys", myArtist.getArtistName());
+  // }
 }
diff --git a/src/test/java/IntegratedTest.java b/src/test/java/IntegratedTest.java
@@ -26,30 +26,37 @@ public void rootTest() {
   @Test
   public void albumnameisCreatedTest() {
     goTo("http://localhost:4567/");
-    fill("#description").with("To Pimp A Butterfly");
+    fill("#title").with("To Pimp A Butterfly");
+    fill("#artist").with("ExampleArists");
     submit(".btn");
     assertThat(pageSource()).contains("Your album has been saved.");
   }
 
   @Test
   public void albumIsDisplayedTest() {
     goTo("http://localhost:4567/");
-    fill("#description").with("To Pimp A Butterfly");
+    fill("#title").with("To Pimp A Butterfly");
+    fill("#artist").with("ExampleArists");
     submit(".btn");
     click("a", withText("Go Back"));
     assertThat(pageSource()).contains("To Pimp A Butterfly");
+    assertThat(pageSource()).contains("ExampleArtists");
     }
 
   @Test
   public void muiltipleAlbumsDisplayed(){
     goTo("http://localhost:4567/");
-    fill("#description").with("To Pimp A Butterfly");
+    fill("#title").with("To Pimp A Butterfly");
+    fill("#artist").with("ExampleArists");
     submit(".btn");
     click("a", withText("Go Back"));
-    fill("#description").with("From Kinshasa");
+    fill("#title").with("From Kinshasa");
+    fill("#artist").with("ExampleArists");
     submit(".btn");
     click("a", withText("Go Back"));
     assertThat(pageSource()).contains("To Pimp A Butterfly");
     assertThat(pageSource()).contains("From Kinshasa");
+    assertThat(pageSource()).contains("ExampleArtists");
   }
+
 }