diff --git a/ProductInventoryLab.iml b/ProductInventoryLab.iml
deleted file mode 100644
index 78b2cc5..0000000
--- a/ProductInventoryLab.iml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4" />
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 43c1af2..306cfad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,5 +21,24 @@
             </plugin>
         </plugins>
     </build>
-
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.4.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.4.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file
diff --git a/src/main/java/models/Sneaker.java b/src/main/java/models/Sneaker.java
new file mode 100644
index 0000000..11783e1
--- /dev/null
+++ b/src/main/java/models/Sneaker.java
@@ -0,0 +1,91 @@
+package models;
+
+public class Sneaker {
+    private int id;
+    private String name;
+    private String brand;
+    private String sport;
+    private float size;
+    private int qty;
+    private  float price;
+
+
+    public Sneaker(int id, String name, String brand, String sport, float size, int qty, float price) {
+        this.id = id;
+        this.name = name;
+        this.brand = brand;
+        this.sport = sport;
+        this.size = size;
+        this.qty = qty;
+        this.price = price;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public String getSport() {
+        return sport;
+    }
+
+    public float getSize() {
+        return size;
+    }
+
+    public int getQty() {
+        return qty;
+    }
+
+    public float getPrice() {
+        return price;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
+    public void setSport(String sport) {
+        this.sport = sport;
+    }
+
+    public void setSize(float size) {
+        this.size = size;
+    }
+
+    public void setQty(int qty) {
+        this.qty = qty;
+    }
+
+    public void setPrice(float price) {
+        this.price = price;
+    }
+
+    @Override
+    public String toString() {
+        return "Sneaker{" +
+                "id=" + id +
+                ", name='" + name + '\'' +
+                ", brand='" + brand + '\'' +
+                ", sport='" + sport + '\'' +
+                ", size=" + size +
+                ", qty=" + qty +
+                ", price=" + price +
+                '}';
+    }
+}
diff --git a/src/main/java/models/Whiskey.java b/src/main/java/models/Whiskey.java
new file mode 100644
index 0000000..1ac27b4
--- /dev/null
+++ b/src/main/java/models/Whiskey.java
@@ -0,0 +1,56 @@
+package models;
+
+public class Whiskey {
+    int id;
+    String name;
+    String brand;
+    float price;
+
+    public Whiskey(int id, String name, String brand,float price) {
+        this.id = id;
+        this.name = name;
+        this.brand = brand;
+        this.price=price;
+
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public float getPrice() {
+        return price;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
+    public void setPrice(float price) {
+        this.price = price;
+    }
+
+    @Override
+    public String toString() {
+        return "Sneaker{" +
+                "id=" + id +
+                ", name='" + name + '\'' +
+                ", brand='" + brand + "}";
+    }
+}
diff --git a/src/main/java/services/SneakerService.java b/src/main/java/services/SneakerService.java
new file mode 100644
index 0000000..8c4c5c3
--- /dev/null
+++ b/src/main/java/services/SneakerService.java
@@ -0,0 +1,51 @@
+package services;
+
+import models.Sneaker;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SneakerService {
+    private static int nextId = 1;
+
+    public static void setNextId(int nextId) {
+        SneakerService.nextId = nextId;
+    }
+
+    private ArrayList<Sneaker> inventory = new ArrayList<>();
+
+    public Sneaker create(String name, String brand, String sport, float size, int quantity, float price) {
+        Sneaker sneaker = new Sneaker(nextId++, name, brand, sport, size, quantity, price);
+        inventory.add(sneaker);
+        return sneaker;
+    }
+
+    public Sneaker findSneaker(int id) {
+        for (int i = 0; i < inventory.size(); i++) {
+            if (inventory.get(i).getId() == id)
+                return inventory.get(i);
+        }
+        return null;
+
+    }
+    public Sneaker[] findAll() {
+        Sneaker[] sneakersArr=new Sneaker[inventory.size()];
+        for(int i=0; i< inventory.size(); i++){
+            sneakersArr[i] = inventory.get(i);
+        }
+
+        return sneakersArr;
+    }
+    public boolean delete(int id) {
+        for(int i=0; i<inventory.size();i++){
+            if(inventory.get(i).getId()==id){
+                inventory.remove(i);
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/services/WhiskeyService.java b/src/main/java/services/WhiskeyService.java
new file mode 100644
index 0000000..4f5bd57
--- /dev/null
+++ b/src/main/java/services/WhiskeyService.java
@@ -0,0 +1,42 @@
+package services;
+
+import models.Whiskey;
+
+import java.util.ArrayList;
+
+public class WhiskeyService {
+    private static int nextId = 1;
+    public static void setNextId(int nextId) {
+        WhiskeyService.nextId = nextId;
+    }
+    private ArrayList<Whiskey> joyInventory = new ArrayList<>();
+    public Whiskey create( String name, String brand,float price){
+        Whiskey whiskey = new Whiskey(nextId++, name, brand,price);
+        joyInventory.add(whiskey);
+        return whiskey;
+    }
+    public Whiskey findWhiskey(int id){
+        for (int i = 0; i < joyInventory.size(); i++) {
+            if (joyInventory.get(i).getId() == id)
+                return joyInventory.get(i);
+        }
+        return null;
+    }
+    public Whiskey[] findAll() {
+        Whiskey[] sneakersArr=new Whiskey[joyInventory.size()];
+        for(int i=0; i< joyInventory.size(); i++){
+            sneakersArr[i] = joyInventory.get(i);
+        }
+
+        return sneakersArr;
+    }
+    public boolean delete(int id) {
+        for(int i=0; i<joyInventory.size();i++){
+            if(joyInventory.get(i).getId()==id){
+                joyInventory.remove(i);
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/test/java/models/SneakerTest.java b/src/test/java/models/SneakerTest.java
new file mode 100644
index 0000000..7d0cb80
--- /dev/null
+++ b/src/test/java/models/SneakerTest.java
@@ -0,0 +1,87 @@
+package models;
+
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+//import org.junit.jupiter.api.Test;
+//import org.junit.jupiter.api.TestTemplate;
+
+
+public class SneakerTest {
+    int expectedId;
+    String expectedName;
+    String expectedBrand;
+    String expectedSport;
+    float expectedSize;
+    int expectedQty;
+
+    float expectedPrice;
+
+    @Before
+    public void setUp() {
+        expectedId = 6;
+        expectedName = "Stan Smith";
+        expectedBrand = "Adidas";
+        expectedSport = "Tennnis";
+        expectedSize = 10.0f;
+        expectedQty = 10;
+        expectedPrice = 80.00f;
+        Sneaker sneaker = new Sneaker(expectedId, expectedName, expectedBrand, expectedSport, expectedSize, expectedQty, expectedPrice);
+
+    }
+
+    @Test
+    public void nameTest() {
+        Sneaker sneaker = new Sneaker(6, "", "", "", 10, 2, 99.90f);
+        int expectedId = 6;
+        String expectedName = "Stan Smith";
+        String expectedBrand = "Adidas";
+        String expectedSport = "Tennnis";
+        float expectedSize = 10.0f;
+        int expectedQty = 10;
+        float expectedPrice = 80.00f;
+    }
+
+    @Test
+    public void constructorTest() {
+
+        int expectedId = 6;
+        String expectedName = "Stan Smith";
+        String expectedBrand = "Adidas";
+        String expectedSport = "Tennnis";
+        float expectedSize = 10.0f;
+        int expectedQty = 10;
+        float expectedPrice = 80.00f;
+
+        Sneaker sneaker = new Sneaker(expectedId, expectedName, expectedBrand, expectedSport, expectedSize, expectedQty, expectedPrice);
+        Assert.assertEquals(expectedId, sneaker.getId());
+        Assert.assertEquals(expectedName, sneaker.getName());
+        Assert.assertEquals(expectedBrand, sneaker.getBrand());
+        Assert.assertEquals(expectedSport, sneaker.getSport());
+        Assert.assertEquals(expectedQty, sneaker.getQty());
+        Assert.assertEquals(expectedPrice, sneaker.getPrice(), 0.0);
+
+    }
+
+    @Test
+    public void testSetterMethods() {
+        Sneaker sneaker = new Sneaker(8, "Dan Smith", "Flojo", "Tennis", 8.5f, 2, 80f);
+        sneaker.setId(expectedId);
+        sneaker.setName(expectedName);
+        sneaker.setBrand(expectedBrand);
+        sneaker.setSport(expectedSport);
+        sneaker.setSize(expectedSize);
+        sneaker.setQty(expectedQty);
+        sneaker.setPrice(expectedPrice);
+
+
+        Assert.assertEquals(expectedId, sneaker.getId());
+        Assert.assertEquals(expectedName, sneaker.getName());
+        Assert.assertEquals(expectedBrand, sneaker.getBrand());
+        Assert.assertEquals(expectedSport, sneaker.getSport());
+        Assert.assertEquals(expectedQty, sneaker.getQty());
+        Assert.assertEquals(expectedPrice, sneaker.getPrice(), 0.0);
+    }
+
+}
diff --git a/src/test/java/models/WhiskeyTest.java b/src/test/java/models/WhiskeyTest.java
new file mode 100644
index 0000000..75210c5
--- /dev/null
+++ b/src/test/java/models/WhiskeyTest.java
@@ -0,0 +1,45 @@
+package models;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class WhiskeyTest {
+    int expectedId;
+    String expectedName;
+    String expectedBrand;
+    float expectedPrice;
+    @Before
+    public void setUp() {
+        expectedId = 6;
+        expectedName = "passion";
+        expectedBrand = "bagpiper";
+        expectedPrice = 70.50f;
+        Whiskey whiskey = new Whiskey(expectedId, expectedName, expectedBrand,expectedPrice);
+    }
+    @Test
+    public void constructorTest(){
+        expectedId = 6;
+        expectedName = "passion";
+        expectedBrand = "bagpiper";
+        Whiskey whiskey = new Whiskey(expectedId, expectedName, expectedBrand,expectedPrice);
+        Assert.assertEquals(expectedId, whiskey.getId());
+        Assert.assertEquals(expectedName, whiskey.getName());
+        Assert.assertEquals(expectedBrand, whiskey.getBrand());
+        Assert.assertEquals(expectedPrice,whiskey.getPrice(),0.001);
+    }
+    @Test
+    public void testSetterMethods() {
+        Whiskey whiskey = new Whiskey(2,"torque","sunshine",70.50f);
+        whiskey.setId(expectedId);
+        whiskey.setName(expectedName);
+        whiskey.setBrand(expectedBrand);
+        whiskey.setPrice(expectedPrice);
+        Assert.assertEquals(expectedId, whiskey.getId());
+        Assert.assertEquals(expectedName, whiskey.getName());
+        Assert.assertEquals(expectedBrand, whiskey.getBrand());
+        Assert.assertEquals(expectedPrice,whiskey.getPrice(),0.001);
+
+    }
+
+}
diff --git a/src/test/java/services/SneakerServiceTest.java b/src/test/java/services/SneakerServiceTest.java
new file mode 100644
index 0000000..d4aae24
--- /dev/null
+++ b/src/test/java/services/SneakerServiceTest.java
@@ -0,0 +1,96 @@
+package services;
+
+import models.Sneaker;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class SneakerServiceTest {
+    SneakerService sneakerService;
+
+    //    ArrayList<Sneaker>inventory=new ArrayList<>();
+    @Before
+    public void setUp() throws Exception {
+        sneakerService = new SneakerService();
+        sneakerService.create("rosy", "fitFlop", "badminton", 4.5f, 1, 90.99f);
+        sneakerService.create("navy", "lotus", "cricket", 3.0f, 4, 45.00f);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        SneakerService.setNextId(1);
+    }
+
+    @Test
+    public void createTest() {
+
+        // (1)
+        String expectedName = "Stan Smith";
+        String expectedBrand = "Adidas";
+        String expectedSport = "Tennis";
+        float expectedSize = 10.5f;
+        int expectedQty = 10;
+        float expectedPrice = 80.00f;
+//        SneakerService sneakerService = new SneakerService();
+        Sneaker sneaker = sneakerService.create(expectedName, expectedBrand, expectedSport, expectedSize, expectedQty, expectedPrice);
+        int actualId = sneaker.getId();
+        String actualName = sneaker.getName();
+        String actualBrand = sneaker.getBrand();
+        String actualSport = sneaker.getSport();
+        float actualSize = sneaker.getSize();
+        int actualQty = sneaker.getQty();
+        float actualPrice = sneaker.getPrice();
+        Assert.assertEquals(Integer.class.getName(), new Integer(actualId).getClass().getName());
+        Assert.assertEquals(expectedName, actualName);
+        Assert.assertEquals(expectedBrand, actualBrand);
+        Assert.assertEquals(expectedSport, actualSport);
+        Assert.assertEquals(expectedSize, actualSize, 0.0);
+        Assert.assertEquals(expectedQty, actualQty);
+        Assert.assertEquals(expectedPrice, actualPrice, 0.0);
+    }
+
+    @Test
+    public void findSneakerTest() {
+        // int expectedId = 3;
+        String expectedName = "Mary Jane";
+        String expectedBrand = "Bata";
+        String expectedSport = "soccer";
+        float expectedSize = 6.5f;
+        int expectedQty = 5;
+        float expectedPrice = 60.00f;
+        Sneaker expected = sneakerService.create(expectedName, expectedBrand, expectedSport, expectedSize, expectedQty, expectedPrice);
+        Sneaker actual = sneakerService.findSneaker(3);
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testFindAll() {
+        Sneaker[] actual = sneakerService.findAll();
+        // Sneaker[] expected =
+        for (int i = 0; i < actual.length; i++) {
+            System.out.printf(actual[i].toString());
+
+        }
+        System.out.println(Arrays.toString(actual));
+        System.out.println(actual.length);
+        Assert.assertEquals(2, actual.length);
+    }
+
+    @Test
+    public void deleteTest() {
+        Boolean b = sneakerService.delete(1);
+        Sneaker s2 = sneakerService.findSneaker(2);
+        //System.out.println(expected);
+        Sneaker s1 = sneakerService.findSneaker(1);
+        Assert.assertNull(s1);
+        Assert.assertNotNull(s2);
+
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/services/WhiskeyServiceTest.java b/src/test/java/services/WhiskeyServiceTest.java
new file mode 100644
index 0000000..e1b722c
--- /dev/null
+++ b/src/test/java/services/WhiskeyServiceTest.java
@@ -0,0 +1,85 @@
+package services;
+
+import models.Sneaker;
+import models.Whiskey;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Arrays;
+
+public class WhiskeyServiceTest {
+    //this is whiskey
+
+        WhiskeyService whiskeyService;
+
+
+        @Before
+        public void setUp() throws Exception {
+            whiskeyService = new WhiskeyService();
+            whiskeyService.create("passion", "bagpiper", 70.00f);
+            whiskeyService.create("ronjo", "samuel",  45.00f);
+        }
+
+        @After
+        public void tearDown() throws Exception {
+            WhiskeyService.setNextId(1);
+        }
+    @Test
+    public void createTest() {
+
+        // (1)
+        String expectedName = "rainFall";
+        String expectedBrand = "axe";
+        float expectedPrice = 80.00f;
+//        SneakerService sneakerService = new SneakerService();
+        Whiskey whiskey = whiskeyService.create(expectedName, expectedBrand, expectedPrice);
+        int actualId = whiskey.getId();
+        String actualName = whiskey.getName();
+        String actualBrand = whiskey.getBrand();
+        float actualPrice = whiskey.getPrice();
+
+        Assert.assertEquals(Integer.class.getName(), new Integer(actualId).getClass().getName());
+        Assert.assertEquals(expectedName, actualName);
+        Assert.assertEquals(expectedBrand, actualBrand);
+        Assert.assertEquals(expectedPrice, actualPrice, 0.0);
+    }
+
+        @Test
+    public void findWhiskeyTest() {
+        // int expectedId = 3;
+        String expectedName = "downFall";
+        String expectedBrand = "reene";
+        float expectedPrice = 60.00f;
+        Whiskey expected = whiskeyService.create(expectedName, expectedBrand,  expectedPrice);
+       Whiskey actual = whiskeyService.findWhiskey(3);
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testFindAll() {
+        Whiskey[] actual = whiskeyService.findAll();
+        // Sneaker[] expected =
+        for (int i = 0; i < actual.length; i++) {
+            System.out.printf(actual[i].toString());
+
+        }
+        System.out.println(Arrays.toString(actual));
+        System.out.println(actual.length);
+        Assert.assertEquals(2, actual.length);
+    }
+
+    @Test
+    public void deleteTest() {
+        Boolean b = whiskeyService.delete(1);
+        Whiskey s2 = whiskeyService.findWhiskey(2);
+        //System.out.println(expected);
+        Whiskey s1 = whiskeyService.findWhiskey(1);
+        Assert.assertNull(s1);
+        Assert.assertNotNull(s2);
+
+
+    }
+}