diff --git a/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/APetHotel.java b/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/APetHotel.java
index 6a5c242b..a9b06f7b 100644
--- a/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/APetHotel.java
+++ b/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/APetHotel.java
@@ -11,6 +11,7 @@
  * A utility class to generate pet hotels with pets already booked
  */
 public class APetHotel {
+
     public static PetAdder with(int petCount) {
         return new PetAdder(petCount);
     }
@@ -38,5 +39,13 @@ private Breed someBreed() {
         private String someName(int petCount) {
             return PET_NAMES.get(random.nextInt(PET_NAMES.size())) + " " + petCount;
         }
+
+        public PetHotel petsCheckIn() {
+            PetHotel petHotel= new PetHotel();
+            for (int i=0;i<petCount; i++)
+                petHotel.checkIn(Pet.dog().named("Fido-"+i));
+
+           return petHotel;
+        }
     }
 }
diff --git a/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/BookingResponse.java b/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/BookingResponse.java
new file mode 100644
index 00000000..2d4f3b57
--- /dev/null
+++ b/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/BookingResponse.java
@@ -0,0 +1,21 @@
+package serenitylabs.tutorials.vetclinic.collections.katas;
+
+/**
+ * Created by kimahale on 9/20/2016.
+ */
+public class BookingResponse {
+
+    private final boolean confirmedStatus;
+
+    public BookingResponse(boolean confirmedStatus) {
+        this.confirmedStatus = confirmedStatus;
+    }
+
+    public boolean isConfirmed() {
+        return confirmedStatus;
+    }
+
+    public boolean isOnWaitingList() {
+        return !confirmedStatus;
+    }
+}
diff --git a/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/PetHotel.java b/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/PetHotel.java
new file mode 100644
index 00000000..a8b6ee73
--- /dev/null
+++ b/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/PetHotel.java
@@ -0,0 +1,41 @@
+package serenitylabs.tutorials.vetclinic.collections.katas;
+
+import serenitylabs.tutorials.vetclinic.Pet;
+
+import java.util.*;
+
+/**
+ * Created by kimahale on 9/20/2016.
+ */
+public class PetHotel {
+
+    private Collection<Pet> pets= new TreeSet<>(Comparator.comparing(Pet::getName));
+    public static int DEFAULT_MAXIMUM_CAPACITY = 20;
+    private Queue<Pet> waitingList = new LinkedList<>();
+
+    public List<Pet> getPets() {
+        return new ArrayList(pets);
+    }
+
+    public BookingResponse checkIn(Pet pet) {
+        boolean confirmStatus= false;
+        if (pets.size() <DEFAULT_MAXIMUM_CAPACITY) {
+            pets.add(pet);
+            confirmStatus=true;
+        }
+        else
+            waitingList.add(pet);
+        return new BookingResponse(confirmStatus);
+    }
+
+    public List<Pet> getWaitingList() {
+        return new ArrayList<>(waitingList);
+    }
+
+    public void checkOut(Pet pet) {
+        pets.remove(pet);
+        if (!waitingList.isEmpty()) {
+            checkIn(waitingList.poll());
+        }
+    }
+}
diff --git a/src/test/java/serenitylabs/tutorials/vetclinic/README.md b/src/test/java/serenitylabs/tutorials/vetclinic/README.md
new file mode 100644
index 00000000..8b2ec7b8
--- /dev/null
+++ b/src/test/java/serenitylabs/tutorials/vetclinic/README.md
@@ -0,0 +1 @@
+Your test code goes here.
diff --git a/src/test/java/serenitylabs/tutorials/vetclinic/collections/katas/WhenBookingPetsIntoAPetHotel.java b/src/test/java/serenitylabs/tutorials/vetclinic/collections/katas/WhenBookingPetsIntoAPetHotel.java
index 5486b552..5061c6c1 100644
--- a/src/test/java/serenitylabs/tutorials/vetclinic/collections/katas/WhenBookingPetsIntoAPetHotel.java
+++ b/src/test/java/serenitylabs/tutorials/vetclinic/collections/katas/WhenBookingPetsIntoAPetHotel.java
@@ -1,54 +1,178 @@
 package serenitylabs.tutorials.vetclinic.collections.katas;
 
 import org.junit.Test;
+import serenitylabs.tutorials.vetclinic.Pet;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.assertThat;
 
 public class WhenBookingPetsIntoAPetHotel {
 
 
     @Test
     public void the_hotel_should_initially_have_no_pets_booked() {
+        // When
+        PetHotel petHotel = new PetHotel();
+        // Then
+        assertThat(petHotel.getPets(), hasSize(0));
     }
 
     @Test
     public void should_be_able_to_check_a_pet_into_the_hotel() throws Exception {
+        // Given
+        PetHotel petHotel=new PetHotel();
+        Pet fido= Pet.dog().named("Fido");
+        //When
+        petHotel.checkIn(fido);
+        // Then
+        assertThat(petHotel.getPets(), hasItems(fido));
     }
 
     @Test
     public void should_be_able_to_check_in_several_pets() throws Exception {
+
+        // Given
+        PetHotel petHotel=new PetHotel();
+        Pet fido= Pet.dog().named("Fido");
+        Pet felix= Pet.cat().named("Felix");
+
+        //When
+        petHotel.checkIn(fido);
+        petHotel.checkIn(felix);
+        // Then
+        assertThat(petHotel.getPets(), hasItems(fido, felix));
+
     }
 
+
     @Test
     public void should_not_be_able_to_check_in_the_same_pet_twice() throws Exception {
+
+        // Given
+        PetHotel petHotel=new PetHotel();
+        Pet fido= Pet.dog().named("Fido");
+        Pet felix= Pet.cat().named("Felix");
+
+        petHotel.checkIn(fido);
+        petHotel.checkIn(felix);
+
+        // When
+        petHotel.checkIn(fido);
+        // Then
+        assertThat(petHotel.getPets(), containsInAnyOrder(fido, felix));
+
     }
 
     @Test
     public void should_be_able_to_retrieve_checked_in_pets_in_alphabetical_order() throws Exception {
+        // Given
+        PetHotel petHotel=new PetHotel();
+        Pet fido= Pet.dog().named("Fido");
+        Pet felix= Pet.cat().named("Felix");
+        Pet tommy= Pet.dog().named("Tommy");
+
+
+        // When
+        petHotel.checkIn(fido);
+        petHotel.checkIn(felix);
+        petHotel.checkIn(tommy);
+        // Then
+        assertThat(petHotel.getPets(), contains(felix, fido, tommy));
+
+
     }
 
     @Test
     public void should_be_able_to_obtain_a_booking_confirmation_when_we_check_in_a_pet() throws Exception {
+
+        // Given
+        PetHotel petHotel=new PetHotel();
+        Pet fido= Pet.dog().named("Fido");
+        // When
+        BookingResponse bookingResponse= petHotel.checkIn(fido);
+        // Then
+        assertThat(bookingResponse.isConfirmed(), equalTo(true));
     }
 
     @Test
     public void should_not_be_able_to_check_in_pets_beyond_hotel_capacity() throws Exception {
+        // Given
+        PetHotel petHotel=APetHotel.with(20).petsCheckIn();
+        Pet fido= Pet.dog().named("Fido");
+
+        // When
+        petHotel.checkIn(fido);
+
+        // Then
+        assertThat(petHotel.getPets(), hasSize(20));
+
     }
 
     @Test
     public void should_notify_owner_that_the_hotel_is_full() throws Exception {
+
+        // Given
+        PetHotel petHotel=APetHotel.with(20).petsCheckIn();
+        Pet fido= Pet.dog().named("Fido");
+        // When
+        BookingResponse bookingResponse= petHotel.checkIn(fido);
+        // Then
+        assertThat(bookingResponse.isConfirmed(), is(false));
+        assertThat(bookingResponse.isOnWaitingList(), is(true));
+
+
     }
 
 
     @Test
     public void should_place_pets_on_a_waiting_list_when_the_hotel_is_full() throws Exception {
+
+        // Given
+        PetHotel petHotel=APetHotel.with(20).petsCheckIn();
+        Pet fido= Pet.dog().named("Fido");
+        // When
+         petHotel.checkIn(fido);
+        // Then
+        assertThat(petHotel.getWaitingList(), hasItem(fido));
+
     }
 
     @Test
     public void pets_on_the_waiting_list_should_be_added_to_the_hotel_when_a_place_is_freed() throws Exception {
+
+        // Given
+        PetHotel petHotel=APetHotel.with(19).petsCheckIn();
+        Pet fido= Pet.dog().named("Fido");
+        Pet felix= Pet.cat().named("Felix");
+        // Pet roger= Pet.rabbit().named("Roger");
+
+        petHotel.checkIn(fido);
+        petHotel.checkIn(felix);
+        // petHotel.checkIn(roger);
+        petHotel.checkOut(fido);
+        // Then
+        assertThat(petHotel.getPets(), hasItem(felix));
+
     }
 
 
     @Test
     public void pets_on_the_waiting_list_should_be_admitted_on_a_first_come_first_served_basis() throws Exception {
+
+        PetHotel hotel = APetHotel.with(19).petsCheckIn();
+        Pet felix = Pet.cat().named("FELIX");
+        Pet fido = Pet.dog().named("FIDO");
+        Pet roger = Pet.rabbit().named("ROGER");
+
+        hotel.checkIn(felix);
+        hotel.checkIn(fido);
+        hotel.checkIn(roger);
+
+        //WHEN
+        hotel.checkOut(felix);
+
+        //Then
+        assertThat(hotel.getPets(), hasItem(fido));
     }
 
 }
diff --git a/src/test/java/serenitylabs/tutorials/vetclinic/package-info.java b/src/test/java/serenitylabs/tutorials/vetclinic/package-info.java
deleted file mode 100644
index 481a4ac9..00000000
--- a/src/test/java/serenitylabs/tutorials/vetclinic/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Unit tests for the Vet Clinic app
- **/
- package serenitylabs.tutorials.vetclinic;