diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index e3f9c21..e0f3b08 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -4,14 +4,15 @@
  * Created by amyquispe on 5/19/15.
  */
 public abstract class AbstractAwesomeClass implements AwesomeInterface {
+    private int someData=4;
 
     @Override
     public int getData() {
-        return 0;
+        return someData;
     }
 
     @Override
     public void setData(int someData) {
-
+        this.someData = someData;
     }
 }
diff --git a/src/main/java/nyc/c4q/AwesomeContainer.java b/src/main/java/nyc/c4q/AwesomeContainer.java
index 64e9fd9..f4e324e 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -7,12 +7,20 @@
 /**
  * Created by amyquispe on 5/19/15.
  */
+
+
 public class AwesomeContainer {
+
+    static ArrayList<ConcreteAwesomeClass> container = new ArrayList<ConcreteAwesomeClass>();
+
+
     public static Collection createAwesomeContainer(){
-        return null;
+        return container;
     }
 
     public static void addAwesomeObject(Collection awesomeContainer){
-        return;
+        ConcreteAwesomeClass meow = new ConcreteAwesomeClass();
+        container.add(meow);
+        awesomeContainer.add(container);
     }
 }
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 2213b83..5075d27 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -6,11 +6,15 @@
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.TextView;
 
 public class InitialActivity extends Activity {
 
+  Button buttonPlus,buttonMinus;
+  TextView tvCounter;
+
   public int counter = 0;
   public SharedPreferences preferences = null;
   public final static String TAG = "C4QTAG";
@@ -18,7 +22,7 @@ public class InitialActivity extends Activity {
   public void loadState(){
     Log.d(TAG, "loadState()");
     counter = preferences.getInt("counter", 0);
-    Log.d(TAG, "loadState(): counter=="+counter);
+    Log.d(TAG, "loadState(): counter==" + counter);
   }
 
   public void saveState(){
@@ -34,5 +38,31 @@ protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_initial);
     preferences = getPreferences(Context.MODE_PRIVATE);
+
+    tvCounter = (TextView) findViewById(R.id.tvCounter);
+
+    buttonPlus = (Button)findViewById(R.id.buttonPlus);
+    buttonPlus.setOnClickListener(new OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        counter++;
+        String number = String.valueOf(counter);
+        tvCounter.setText(number);
+
+      }
+    });
+
+    buttonMinus = (Button)findViewById(R.id.buttonMinus);
+    buttonMinus.setOnClickListener(new OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        counter--;
+        String number = String.valueOf(counter);
+        tvCounter.setText(number);
+      }
+    });
+
   }
+
+
 }
diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java
index ef94dce..80aa846 100644
--- a/src/main/java/nyc/c4q/SubFunClass.java
+++ b/src/main/java/nyc/c4q/SubFunClass.java
@@ -3,7 +3,17 @@
 /**
  * Created by amyquispe on 5/19/15.
  */
-public class SubFunClass {
+public class SubFunClass extends SuperFunClass implements AwesomeInterface{
     public SubFunClass(){
     }
+
+    @Override
+    public int getData() {
+        return 0;
+    }
+
+    @Override
+    public void setData(int someData) {
+
+    }
 }
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 49e22b0..e3096e0 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -9,10 +9,65 @@
     tools:context="nyc.c4q.InitialActivity"
     android:id="@+id/activity_initial">
 
-    <TextView
-        android:id="@+id/text"
+    <LinearLayout
+        android:id="@+id/counterLayout"
+        android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="InitialActivity"
-        />
+        android:layout_height="0dp"
+        android:layout_weight="2">
+
+        <LinearLayout
+            android:id="@+id/counterButtonsLayout"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:layout_weight="1">
+
+            <Button
+                android:id="@+id/buttonPlus"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:textSize="100dp"
+                android:layout_weight="1"
+                android:text="+"/>
+
+            <Button
+                android:id="@+id/buttonMinus"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:textSize="100dp"
+                android:layout_weight="1"
+                android:text="-"/>
+
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tvCounter"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:textSize="100dp"
+            android:text="0"
+            android:layout_weight="1"/>
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/buttonTileActivity"
+        android:layout_height="0dp"
+        android:layout_width="match_parent"
+        android:text="TileActivity"
+        android:layout_weight="1"/>
+
+    <Button
+        android:id="@+id/buttonEmpty"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:text="Empty"/>
+
+
+
+
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_tile.xml b/src/main/res/layout/activity_tile.xml
index 4e36a11..e888893 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -3,13 +3,58 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="horizontal"
     tools:context="nyc.c4q.TileActivity"
     android:id="@+id/activity_tile"
     >
 
-    <TextView
-        android:layout_height="match_parent"
+    <LinearLayout
+        android:id="@+id/leftSide"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_weight="1">
+        <View
+            android:id="@+id/redView"
+            android:layout_height="0dp"
+            android:layout_width="match_parent"
+            android:layout_weight="40"
+            android:background="#ffff0000" />
+
+        <View
+            android:id="@+id/greenView"
+            android:layout_height="0dp"
+            android:layout_width="match_parent"
+            android:layout_weight="60"
+            android:background="#ff00ff00"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/rightSide"
         android:layout_width="match_parent"
-        android:text="TileActivity"/>
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:layout_weight="1">
+        <View
+            android:id="@+id/yellowView"
+            android:layout_height="0dp"
+            android:layout_width="match_parent"
+            android:layout_weight="33"
+            android:background="#ffffff00"/>
+        <View
+            android:id="@+id/whiteView"
+            android:layout_height="0dp"
+            android:layout_width="match_parent"
+            android:layout_weight="44"
+            android:background="#ffffffff"/>
+        <View
+            android:id="@+id/blueView"
+            android:layout_height="0dp"
+            android:layout_width="match_parent"
+            android:layout_weight="22"
+            android:background="#ff0000ff"/>
+
+    </LinearLayout>
 
 </LinearLayout>
+
diff --git a/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java b/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
index de10077..1d6e2f3 100644
--- a/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
+++ b/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
@@ -7,8 +7,8 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertEquals;