diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 7a4bf35..3860742 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -7,6 +7,7 @@
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <module name="ProductInventoryLab" />
+        <module name="Product-Inventory-Lab" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel target="1.8" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4b661a5..3ccb27b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/pom.xml b/pom.xml
index 43c1af2..9eddc3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,5 +21,29 @@
             </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>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.10.1</version>
+        </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/App.java b/src/main/java/App.java
new file mode 100644
index 0000000..6fcb27e
--- /dev/null
+++ b/src/main/java/App.java
@@ -0,0 +1,21 @@
+import Services.TradingCardService;
+import io.Console;
+
+public class App {
+    private TradingCardService tradingCardService = new TradingCardService();
+    public static void main(String[] args) {
+
+//        App application = new App(); // (2)
+//        application.init();  // (3)
+//
+//
+//        public void init () {
+//            // (4)
+//            // application logic here
+//            // call methods to take user input and interface with services
+//            Console.printWelcome();
+//        }
+    }
+    }
+
+
diff --git a/src/main/java/Models/Desserts.java b/src/main/java/Models/Desserts.java
new file mode 100644
index 0000000..60c75cb
--- /dev/null
+++ b/src/main/java/Models/Desserts.java
@@ -0,0 +1,57 @@
+package Models;
+
+public class Desserts {
+
+
+
+    private int id;
+    private String name;
+    private double price;
+    private int popularity;
+    private int numServes;
+
+    public Desserts(){
+
+    }
+
+    public Desserts(int id, String name, double price, int popularity, int numServes){
+        this.id = id;
+        this.name = name;
+        this.price = price;
+        this.popularity = popularity;
+        this.numServes = numServes;
+
+    }
+    public void setId(int id) {
+        this.id = id;
+    }
+    public int getId() {
+        return id;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getName() {
+        return name;
+    }
+    public void setPrice(double price) {
+        this.price = price;
+    }
+    public double getPrice() {
+        return price;
+    }
+
+    public void setpopularity(int popularity) {
+        this.popularity = popularity;
+    }
+    public int getpopularity() {
+        return popularity;
+    }
+
+    public void setnumServes(int numServes) {
+        this.numServes = numServes;
+    }
+    public int getnumServes() {
+        return numServes;
+    }
+}
diff --git a/src/main/java/Models/TradingCards.java b/src/main/java/Models/TradingCards.java
new file mode 100644
index 0000000..ce735ae
--- /dev/null
+++ b/src/main/java/Models/TradingCards.java
@@ -0,0 +1,55 @@
+package Models;
+
+public class TradingCards {
+    private int id;
+    private  String game;
+    private int rarity;
+    private boolean isFromStartedDeck;
+    private double price;
+
+    public TradingCards(){
+
+    }
+
+    public TradingCards(int id, String game, int rarity, boolean isFromStartedDeck, double price){
+        this.id = id;
+        this.game = game;
+        this.rarity = rarity;
+        this.isFromStartedDeck = isFromStartedDeck;
+        this.price = price;
+    }
+
+
+    public void setId(int id) {
+        this.id = id;
+    }
+    public int getId() {
+        return id;
+    }
+    public void setGame(String game) {
+        this.game = game;
+    }
+    public String getGame() {
+        return game;
+    }
+    public void setRarity(int rarity) {
+        this.rarity = rarity;
+    }
+    public int getRarity() {
+        return rarity;
+    }
+
+    public void setFromStarterDeck(boolean isFromStartedDeck) {
+        this.isFromStartedDeck = isFromStartedDeck;
+    }
+    public boolean getFromStarterDeck() {
+        return isFromStartedDeck;
+    }
+
+    public void setPrice(double price) {
+        this.price = price;
+    }
+    public double getPrice() {
+        return price;
+    }
+}
diff --git a/src/main/java/Services/DessertsService.java b/src/main/java/Services/DessertsService.java
new file mode 100644
index 0000000..83f70a0
--- /dev/null
+++ b/src/main/java/Services/DessertsService.java
@@ -0,0 +1,55 @@
+package Services;
+
+import Models.Desserts;
+
+import java.util.ArrayList;
+
+public  class DessertsService {
+    private static int nextId = 1;  // (1)
+
+    private static ArrayList <Desserts> inventory = new ArrayList<>();  // (2)
+
+    public static Desserts create(String name, double price, int popularity, int numServes) {
+
+        // (2)
+        Desserts createdDessert = new Desserts(nextId++, name, price, popularity, numServes);
+
+        // (3)
+        inventory.add(createdDessert);
+
+        // (4)
+        return createdDessert;
+    }
+    //read
+    public Desserts findDessert(int id) {
+        // should take an int and return an object with that id, if exists
+        for(int i=0; i<inventory.size(); i++){
+            if(inventory.get(i).getId()==id){
+                return inventory.get(i);
+            }
+        }
+        return null;
+    }
+
+    //read all
+    public Desserts[] findAll() {
+        // should return a basic array copy of the ArrayList
+        Desserts[] desArr = new Desserts[inventory.size()];
+        for(int i=0; i<inventory.size(); i++){
+            desArr[i] = inventory.get(i);
+        }
+        return desArr;
+    }
+
+    //delete
+    public boolean delete(int id) {
+        // should remove the object with this id from the ArrayList if exits and return true.
+        // Otherwise return false
+        if(findDessert(id) != null){
+            inventory.remove(findDessert(id));
+            return true;
+        }else{
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/Services/TradingCardService.java b/src/main/java/Services/TradingCardService.java
new file mode 100644
index 0000000..747d023
--- /dev/null
+++ b/src/main/java/Services/TradingCardService.java
@@ -0,0 +1,58 @@
+package Services;
+
+import Models.Desserts;
+import Models.TradingCards;
+import com.sun.deploy.net.MessageHeader;
+
+import java.util.ArrayList;
+
+public class TradingCardService {
+    private static int nextId = 1;  // (1)
+
+
+    private static ArrayList <TradingCards> inventory = new ArrayList<>();  // (2)
+
+    public static TradingCards create(String game, int rarity, boolean isFromStartedDeck, double price) {
+
+        // (2)
+        TradingCards createdTradingCard = new TradingCards(nextId++, game, rarity, isFromStartedDeck, price);
+
+        // (3)
+        inventory.add(createdTradingCard);
+
+        // (4)
+        return createdTradingCard;
+    }
+    //read
+    public TradingCards findTradingCard(int id) {
+        // should take an int and return an object with that id, if exists
+        for(int i=0; i<inventory.size(); i++){
+            if(inventory.get(i).getId()==id){
+                return inventory.get(i);
+            }
+        }
+        return null;
+    }
+
+    //read all
+    public TradingCards[] findAll() {
+        // should return a basic array copy of the ArrayList
+        TradingCards[] tcArr = new TradingCards[inventory.size()];
+        for(int i=0; i<inventory.size(); i++){
+            tcArr[i] = inventory.get(i);
+        }
+        return tcArr;
+    }
+
+    //delete
+    public boolean delete(int id) {
+        // should remove the object with this id from the ArrayList if exits and return true.
+        // Otherwise return false
+        if(findTradingCard(id) != null){
+            inventory.remove(findTradingCard(id));
+            return true;
+        }else{
+            return false;
+        }
+    }
+}
diff --git a/src/main/java/io/Console.java b/src/main/java/io/Console.java
new file mode 100644
index 0000000..952125d
--- /dev/null
+++ b/src/main/java/io/Console.java
@@ -0,0 +1,12 @@
+package io;
+
+public class Console {
+    public static void printWelcome(){
+        System.out.println("" +
+                "**************************************************" +
+                "***           Welcome and Bienvenue            ***" +
+                "***                    to                      ***" +
+                "***          ZipCo Inventory Manager           ***" +
+                "**************************************************");
+    }
+}
diff --git a/src/test/java/Models/DessertsTest.java b/src/test/java/Models/DessertsTest.java
new file mode 100644
index 0000000..635b9f9
--- /dev/null
+++ b/src/test/java/Models/DessertsTest.java
@@ -0,0 +1,33 @@
+package Models;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class DessertsTest {
+    @Test
+    public void setNameTest() {
+        String expected = "brownie";
+        Desserts testDessert = new Desserts();
+        testDessert.setName(expected);
+        Assertions.assertEquals(expected, testDessert.getName());
+    }
+
+@Test // (1)
+public void constructorTest(){
+    int exid = 6;
+    String exname = "icecream";
+    double exprice = 4.00;
+    int expopularity = 9;
+    int exnumServes = 2;
+
+    Desserts testDessert = new Desserts(exid, exname, exprice, expopularity,
+            exnumServes);
+
+    Assertions.assertEquals(exid, testDessert.getId());
+    Assertions.assertEquals(exname, testDessert.getName());
+    Assertions.assertEquals(exprice, testDessert.getPrice());
+    Assertions.assertEquals(expopularity, testDessert.getpopularity());
+    Assertions.assertEquals(exnumServes, testDessert.getnumServes());
+
+}
+}
diff --git a/src/test/java/Models/TradingCardTest.java b/src/test/java/Models/TradingCardTest.java
new file mode 100644
index 0000000..3f2465b
--- /dev/null
+++ b/src/test/java/Models/TradingCardTest.java
@@ -0,0 +1,34 @@
+package Models;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class TradingCardTest {
+    @Test
+    public void setGameTest() {
+        String expected = "pokemon";
+        TradingCards testGame = new TradingCards();
+        testGame.setGame(expected);
+        Assertions.assertEquals(expected, testGame.getGame());
+    }
+
+    @Test // (1)
+    public void constructorTest(){
+        int exid = 5;
+          String exgame = "DnD";
+         int exrarity = 6;
+         boolean exisFromStartedDeck = false;
+         double exprice = 15.00;
+
+        TradingCards testCard = new TradingCards(exid, exgame, exrarity, exisFromStartedDeck,
+                exprice);
+
+        Assertions.assertEquals(exid, testCard.getId());
+        Assertions.assertEquals(exgame, testCard.getGame());
+        Assertions.assertEquals(exrarity, testCard.getRarity());
+        Assertions.assertEquals(exisFromStartedDeck, testCard.getFromStarterDeck());
+        Assertions.assertEquals(exprice, testCard.getPrice());
+
+    }
+}
+
diff --git a/src/test/java/Services/DessertsServiceTest.java b/src/test/java/Services/DessertsServiceTest.java
new file mode 100644
index 0000000..28e9ae1
--- /dev/null
+++ b/src/test/java/Services/DessertsServiceTest.java
@@ -0,0 +1,74 @@
+package Services;
+
+import Models.Desserts;
+
+import org.junit.Before;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class DessertsServiceTest {
+    DessertsService ds1;
+    Desserts des1;
+    Desserts des2;
+    Desserts des3;
+
+    @Before
+    public void setUp(){
+        ds1 = new DessertsService();
+
+        des1 = ds1.create(
+                "brownie",
+                2.00,
+                6,
+                1);
+
+
+        des2 = ds1.create(
+                "crepe",
+                9.00,
+                8,
+                2);
+
+
+        des3 = ds1.create(
+                "sundae",
+                4.00,
+                10,
+                3);
+
+
+    }
+
+
+
+
+    @Test // (1)
+    public void createTest(){
+
+        String exname = "icecream";
+        double exprice = 4.00;
+        int expopularity = 3;
+        int exnumServes = 2;
+
+        DessertsService dService = new DessertsService();
+        Desserts testDessert = DessertsService.create(exname, exprice, expopularity,
+                exnumServes);
+
+        int actualId = testDessert.getId();
+        String actualname = testDessert.getName();
+        double actualprice = testDessert.getPrice();
+        int actualpopularity = testDessert.getpopularity();
+        int actualnumServes = testDessert.getnumServes();
+
+
+
+
+        Assertions.assertEquals(Integer.class.getName(), new Integer(actualId).getClass().getName());
+        Assertions.assertEquals(exname, actualname);
+        Assertions.assertEquals(exprice, actualprice);
+        Assertions.assertEquals(expopularity, actualpopularity);
+        Assertions.assertEquals(exnumServes, actualnumServes);
+
+    }
+
+}
diff --git a/src/test/java/Services/TradingCardsServiceTest.java b/src/test/java/Services/TradingCardsServiceTest.java
new file mode 100644
index 0000000..58da75d
--- /dev/null
+++ b/src/test/java/Services/TradingCardsServiceTest.java
@@ -0,0 +1,71 @@
+package Services;
+
+import Models.Desserts;
+import Models.TradingCards;
+import org.junit.Before;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class TradingCardsServiceTest {
+    TradingCardService tcs1;
+    TradingCards tc1;
+    TradingCards tc2;
+    TradingCards tc3;
+
+    @Before
+    public void setUp(){
+        tcs1 = new TradingCardService();
+
+        tc1 = tcs1.create(
+                "pokemon",
+                6,
+                false,
+                12.00);
+
+
+        tc2 = tcs1.create(
+                "magic",
+                2,
+                true,
+                4.00);
+
+
+        tc3 = tcs1.create(
+                "yu-gi-oh!",
+                9,
+                false,
+                30.00);
+
+
+    }
+
+
+    @Test // (1)
+    public void createTest(){
+        String exgame = "DnD";
+        int exrarity = 6;
+        boolean exisFromStartedDeck = false;
+        double exprice = 15.00;
+
+        TradingCardService tcService = new TradingCardService();
+        TradingCards testCard = TradingCardService.create(exgame, exrarity, exisFromStartedDeck,
+                exprice);
+
+        int actualId = testCard.getId();
+        String actualgame = testCard.getGame();
+        int actualrarity = testCard.getRarity();
+        boolean actualisFromStartedDeck = testCard.getFromStarterDeck();
+        double actualprice = testCard.getPrice();
+
+
+
+
+        Assertions.assertEquals(Integer.class.getName(), new Integer(actualId).getClass().getName());
+        Assertions.assertEquals(exgame, actualgame);
+        Assertions.assertEquals(exrarity, actualrarity);
+        Assertions.assertEquals(exisFromStartedDeck, actualisFromStartedDeck);
+        Assertions.assertEquals(exprice, actualprice);
+
+    }
+
+}