diff --git a/classes-part-2/studio/src/main/java/org/launchcode/Menu.java b/classes-part-2/studio/src/main/java/org/launchcode/Menu.java
index b4601316b..a1a30f311 100644
--- a/classes-part-2/studio/src/main/java/org/launchcode/Menu.java
+++ b/classes-part-2/studio/src/main/java/org/launchcode/Menu.java
@@ -1,32 +1,69 @@
 package org.launchcode;
+import org.launchcode.MenuItem;
 
 import java.util.ArrayList;
 import java.util.Date;
 
+//public class Menu {
+//    private Date lastUpdated;
+//    private ArrayList<MenuItem> items;
+//
+//    public Menu(Date d, ArrayList<MenuItem> i) {
+//        this.lastUpdated = d;
+//        this.items = i;
+//    }
+//
+//    public void setLastUpdated(Date lastUpdated) {
+//        this.lastUpdated = lastUpdated;
+//    }
+//
+//    public void setItems(ArrayList<MenuItem> items) {
+//        this.items = items;
+//    }
+//
+//    public Date getLastUpdated() {
+//        return lastUpdated;
+//    }
+//
+//    public ArrayList<MenuItem> getItems() {
+//        return items;
+//    }
+//}
+
+
+
+
+
 public class Menu {
-    private Date lastUpdated;
     private ArrayList<MenuItem> items;
 
-    public Menu(Date d, ArrayList<MenuItem> i) {
-        this.lastUpdated = d;
-        this.items = i;
-    }
-
-    public void setLastUpdated(Date lastUpdated) {
-        this.lastUpdated = lastUpdated;
+    public ArrayList<MenuItem> getItems() {
+        return items;
     }
 
     public void setItems(ArrayList<MenuItem> items) {
         this.items = items;
     }
 
-    public Date getLastUpdated() {
-        return lastUpdated;
-    }
+    public static void menuSetter(ArrayList){
+        for (Object menuItem:ArrayList){
+            if (category = "Apps") {
+                System.out.println(menuItem);
+            }
 
-    public ArrayList<MenuItem> getItems() {
-        return items;
-    }
-}
+        }
+        for (Object menuItem:ArrayList) {
+            if (category = "Entrees") {
+                System.out.println(menuItem);
+            }
+        }
+
+        for (Object menuItem:ArrayList) {
+            if (category = "Desserts") {
+                System.out.println(menuItem);
+            }
+        }
 
 
+    }
+}
diff --git a/classes-part-2/studio/src/main/java/org/launchcode/MenuItem.java b/classes-part-2/studio/src/main/java/org/launchcode/MenuItem.java
index 22ba70e45..5654aacda 100644
--- a/classes-part-2/studio/src/main/java/org/launchcode/MenuItem.java
+++ b/classes-part-2/studio/src/main/java/org/launchcode/MenuItem.java
@@ -1,32 +1,102 @@
 package org.launchcode;
+import org.launchcode.Menu;
+import java.util.ArrayList;
+
+//public class MenuItem {
+//    private double price;
+//    private String description;
+//    private String category;
+//    private boolean isNew;
+//
+//    public MenuItem(double p, String d, String c, boolean iN) {
+//        this.price = p;
+//        this.description = d;
+//        this.category = c;
+//        this.isNew = iN;
+//    }
+//
+//    public void setPrice(double price) {
+//        this.price = price;
+//    }
+//
+//    public void setDescription(String description) {
+//        this.description = description;
+//    }
+//
+//    public void setCategory(String category) {
+//        this.category = category;
+//    }
+//
+//    public void setNew(boolean aNew) {
+//        isNew = aNew;
+//    }
+//}
+
+
+
+
+
+
+
 
 public class MenuItem {
-    private double price;
-    private String description;
-    private String category;
-    private boolean isNew;
+   private  String category;
+   private String itemName;
+   private Double price;
+   private String description;
+   private Boolean novelty = true;
+//   private ArrayList<Object> allMenuItems = new ArrayList <>();
+
+
+    public MenuItem(String category, String itemName, Double price, String description){
+        this.category = category;
+        this.itemName = itemName;
+        this.price = price;
+        this.description = description;
+        //allMenuItems.add(this);
+    }
 
-    public MenuItem(double p, String d, String c, boolean iN) {
-        this.price = p;
-        this.description = d;
-        this.category = c;
-        this.isNew = iN;
+    public String getCategory() {
+        return category;
     }
 
-    public void setPrice(double price) {
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
+
+    public Double getPrice() {
+        return price;
+    }
+
+    public void setPrice(Double price) {
         this.price = price;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
     public void setDescription(String description) {
         this.description = description;
     }
 
-    public void setCategory(String category) {
-        this.category = category;
+    public Boolean getNovelty() {
+        return novelty;
     }
 
-    public void setNew(boolean aNew) {
-        isNew = aNew;
+    public void setNovelty(Boolean novelty) {
+        this.novelty = novelty;
     }
 }
 
+//MenuItem wings = new MenuItem ("apps", "wings", 10, "lightly breaded and fried chicken wings served with sauces")
+//MenuItem lambChops = new MenuItem ("entrees", "Lamb Chops", 28.35, "Rack of Lamb Chops in cilantro ginger marinade on a bed of shishieto peppers with chili honey glaze")
+//MenuItem chocolateCake = new MenuItem ("desserts", "chocolate cake", 6.95, "A soft and tender Chocolate Fudge cake covered in a rich and creamy chocolate buttercream\n")
\ No newline at end of file
diff --git a/classes-part-2/studio/src/main/java/org/launchcode/Main.java b/classes-part-2/studio/src/main/java/org/launchcode/Restaurant.java
similarity index 54%
rename from classes-part-2/studio/src/main/java/org/launchcode/Main.java
rename to classes-part-2/studio/src/main/java/org/launchcode/Restaurant.java
index a284b3822..69ad5da9a 100644
--- a/classes-part-2/studio/src/main/java/org/launchcode/Main.java
+++ b/classes-part-2/studio/src/main/java/org/launchcode/Restaurant.java
@@ -1,8 +1,9 @@
 package org.launchcode;
 
-public class Main {
+
+public class Restaurant {
 
     public static void main(String[] args) {
-        // write your code here
+        Menu.menuSetter(allMenuItems);
     }
 }
diff --git a/datatypes/datatypes-studio/Source/Main/Java/org/launchcode/Area.java b/datatypes/datatypes-studio/Source/Main/Java/org/launchcode/Area.java
new file mode 100644
index 000000000..ded55b219
--- /dev/null
+++ b/datatypes/datatypes-studio/Source/Main/Java/org/launchcode/Area.java
@@ -0,0 +1,21 @@
+package org.launchcode;
+import java.util.Scanner;
+
+public class Area {
+    public static void main(String[] args){
+        double radius;
+        double area;
+        Scanner input;
+        input = new Scanner(System.in);
+        System.out.println("Enter a radius.");
+        radius = input.nextDouble();
+        input.close();
+        if (radius > 0) {
+            area = Circle.getArea(radius);
+            System.out.println("The area of the circle with radius " + radius + " is " + area);
+            } else {
+            System.out.println("Error");
+
+        }
+    }
+}
diff --git a/datatypes/datatypes-studio/Source/Main/Java/org/launchcode/Circle.java b/datatypes/datatypes-studio/Source/Main/Java/org/launchcode/Circle.java
new file mode 100644
index 000000000..2c85c32db
--- /dev/null
+++ b/datatypes/datatypes-studio/Source/Main/Java/org/launchcode/Circle.java
@@ -0,0 +1,7 @@
+package org.launchcode;
+
+public class Circle {
+    public static Double getArea(Double radius) {
+    return 3.14 * radius * radius;
+}
+}
diff --git a/datatypes/datatypes-studio/Source/Main/Java/org/launchcode/Menu.java b/datatypes/datatypes-studio/Source/Main/Java/org/launchcode/Menu.java
new file mode 100644
index 000000000..5f44f36ed
--- /dev/null
+++ b/datatypes/datatypes-studio/Source/Main/Java/org/launchcode/Menu.java
@@ -0,0 +1,68 @@
+package org.launchcode;
+
+import java.util.ArrayList;
+import java.util.Date;
+
+//public class Menu {
+//    private Date lastUpdated;
+//    private ArrayList<MenuItem> items;
+//
+//    public Menu(Date d, ArrayList<MenuItem> i) {
+//        this.lastUpdated = d;
+//        this.items = i;
+//    }
+//
+//    public void setLastUpdated(Date lastUpdated) {
+//        this.lastUpdated = lastUpdated;
+//    }
+//
+//    public void setItems(ArrayList<MenuItem> items) {
+//        this.items = items;
+//    }
+//
+//    public Date getLastUpdated() {
+//        return lastUpdated;
+//    }
+//
+//    public ArrayList<MenuItem> getItems() {
+//        return items;
+//    }
+//}
+
+
+
+
+
+public class Menu {
+    private ArrayList<MenuItem> items;
+
+    public ArrayList<MenuItem> getItems() {
+        return items;
+    }
+
+    public void setItems(ArrayList<MenuItem> items) {
+        this.items = items;
+    }
+
+    public static void menuSetter(ArrayList){
+       for (Object menuItem:ArrayList){
+           if (category = "Apps") {
+               System.out.println(menuItem);
+           }
+
+       }
+        for (Object menuItem:ArrayList) {
+            if (category = "Entrees") {
+                System.out.println(menuItem);
+            }
+        }
+
+        for (Object menuItem:ArrayList) {
+            if (category = "Desserts") {
+                System.out.println(menuItem);
+            }
+        }
+
+
+    }
+}
diff --git a/unit-testing/studio/balanced-brackets/src/main/java/org/launchcode/BalancedBrackets.java b/unit-testing/studio/balanced-brackets/src/main/java/org/launchcode/BalancedBrackets.java
index 890783e59..feed2fe69 100644
--- a/unit-testing/studio/balanced-brackets/src/main/java/org/launchcode/BalancedBrackets.java
+++ b/unit-testing/studio/balanced-brackets/src/main/java/org/launchcode/BalancedBrackets.java
@@ -19,10 +19,25 @@ public class BalancedBrackets {
      * @param str - to be validated
      * @return true if balanced, false otherwise
      */
+//    public static boolean hasBalancedBrackets(String str) {
+//        int brackets = 0;
+//        for (char ch : str.toCharArray()) {
+//            if (ch == '[') {
+//                brackets++;
+//            } else if (ch == ']') {
+//                brackets--;
+//            }
+//        }
+//        return brackets == 0;
+//    }
     public static boolean hasBalancedBrackets(String str) {
         int brackets = 0;
         for (char ch : str.toCharArray()) {
-            if (ch == '[') {
+            if (str.indexOf(']') < str.indexOf('[')) {
+                return false;
+            } else if (str.lastIndexOf('[') > str.lastIndexOf(']') ){
+                return false;
+            }else if(ch == '[') {
                 brackets++;
             } else if (ch == ']') {
                 brackets--;
diff --git a/unit-testing/studio/balanced-brackets/src/test/java/org/launchcode/BalancedBracketsTest.java b/unit-testing/studio/balanced-brackets/src/test/java/org/launchcode/BalancedBracketsTest.java
index a9d8821b3..ca284a2e9 100644
--- a/unit-testing/studio/balanced-brackets/src/test/java/org/launchcode/BalancedBracketsTest.java
+++ b/unit-testing/studio/balanced-brackets/src/test/java/org/launchcode/BalancedBracketsTest.java
@@ -1,13 +1,70 @@
 package org.launchcode;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 class BalancedBracketsTest {
+
     //TODO: add tests here
     @Test
     public void emptyTest() {
         assertEquals(true, true);
     }
+
+    @Test
+    public void onlyBracketsReturnsTrue() {
+        assertTrue(BalancedBrackets.hasBalancedBrackets("[]"));
+    }
+
+    @Test
+    public void stringWithBracketsReturnsTrue() {
+        assertTrue(BalancedBrackets.hasBalancedBrackets("[LaunchCode]"));
+    }
+
+    @Test
+    public void stringWithNoBracketsReturnsTrue() {
+        assertTrue(BalancedBrackets.hasBalancedBrackets("LaunchCode"));
+    }
+
+    @Test
+    public void stringWithTwoBracketsReturnsTrue() {
+        assertTrue(BalancedBrackets.hasBalancedBrackets("[][]"));
+    }
+
+    @Test
+    public void stringWithOneBracketReturnsFalse() {
+        assertFalse(BalancedBrackets.hasBalancedBrackets("["));
+    }
+
+    @Test
+    public void stringWithUnbalancedBracketReturnsFalse() {
+        assertFalse(BalancedBrackets.hasBalancedBrackets("[Launch[Code]"));
+    }
+
+    @Test
+    public void stringWithUnMatchedOpeningBrackets () {
+        assertFalse(BalancedBrackets.hasBalancedBrackets("Launch[Co[de"));
+    }
+
+    @Test
+    public void stringWithUnMatchedClosingBrackets () {
+        assertFalse(BalancedBrackets.hasBalancedBrackets("Launch]Co]de"));
+    }
+
+    @Test
+    public void stringWithIncorrectlyFacingBracketsReturnsFalse() {
+        assertFalse(BalancedBrackets.hasBalancedBrackets("]["));
+    }
+
+    @Test
+    public void stringWithIncorrectlyFacingEndBracketReturnsFalse() {
+        assertFalse(BalancedBrackets.hasBalancedBrackets("[]]["));
+    }
+
+    @Test
+    public void stringWithManyBracketReturnsFalse() {
+        assertFalse(BalancedBrackets.hasBalancedBrackets("[]][[]]"));
+    }
 }
\ No newline at end of file