diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index e3f9c21..74d884e 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -5,13 +5,15 @@
  */
 public abstract class AbstractAwesomeClass implements AwesomeInterface {
 
+    int num = 4;
+
     @Override
     public int getData() {
-        return 0;
+        return num;
     }
 
     @Override
     public void setData(int someData) {
-
+        num = someData;
     }
 }
diff --git a/src/main/java/nyc/c4q/AwesomeContainer.java b/src/main/java/nyc/c4q/AwesomeContainer.java
index 64e9fd9..5b91f5b 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -3,16 +3,22 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 
 /**
  * Created by amyquispe on 5/19/15.
  */
 public class AwesomeContainer {
+
+    private static ArrayList myList = new ArrayList();
+    private static ConcreteAwesomeClass o = new ConcreteAwesomeClass();
+
     public static Collection createAwesomeContainer(){
-        return null;
+
+        return myList;
     }
 
     public static void addAwesomeObject(Collection awesomeContainer){
-        return;
+        awesomeContainer.add(o);
     }
 }
diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
index f39acca..8f060b1 100644
--- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
+++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
@@ -3,7 +3,7 @@
 /**
  * Created by amyquispe on 5/19/15.
  */
-public class ConcreteAwesomeClass extends AbstractAwesomeClass {
+public class ConcreteAwesomeClass extends AbstractAwesomeClass implements AwesomeInterface {
     public ConcreteAwesomeClass(){
     }
     public ConcreteAwesomeClass(int startData){
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 2213b83..4bd8f17 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -2,6 +2,8 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
@@ -9,8 +11,13 @@
 import android.widget.Button;
 import android.widget.TextView;
 
-public class InitialActivity extends Activity {
+public class InitialActivity extends Activity implements View.OnClickListener {
 
+  Button plus;
+  Button minus;
+  Button empty;
+  Button tileActivity;
+  TextView tvCounter;
   public int counter = 0;
   public SharedPreferences preferences = null;
   public final static String TAG = "C4QTAG";
@@ -33,6 +40,107 @@ public void saveState(){
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_initial);
+
+    SharedPreferences preferences1 = getPreferences(MODE_PRIVATE);
+
+    plus = (Button)findViewById(R.id.buttonPlus);
+    minus = (Button)findViewById(R.id.buttonMinus);
+    empty = (Button)findViewById(R.id.buttonEmpty);
+    tileActivity = (Button)findViewById(R.id.buttonTileActivity);
+
+      tvCounter = (TextView)findViewById(R.id.tvCounter);
+      String counterValue = tvCounter.getText().toString();
+      tvCounter.setText(preferences1.getString("Counter", counterValue));
+
+      plus.setOnClickListener(this);
+      minus.setOnClickListener(this);
+      empty.setOnClickListener(this);
+      tileActivity.setOnClickListener(this);
+
     preferences = getPreferences(Context.MODE_PRIVATE);
   }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        SharedPreferences preference = getPreferences(MODE_PRIVATE);
+        SharedPreferences.Editor editor = preferences.edit();
+
+        TextView tvCounter = (TextView)findViewById(R.id.tvCounter);
+        String counter = tvCounter.getText().toString();
+
+        editor.putString("Counter", counter);
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle savedInstanceSate) {
+        super.onSaveInstanceState(savedInstanceSate);
+
+        TextView tvCounter = (TextView)findViewById(R.id.tvCounter);
+        String countValue = tvCounter.getText().toString();
+
+        savedInstanceSate.putString("Count", countValue);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        SharedPreferences preference = getPreferences(MODE_PRIVATE);
+        SharedPreferences.Editor editor = preferences.edit();
+
+        TextView tvCounter = (TextView)findViewById(R.id.tvCounter);
+        String counter = tvCounter.getText().toString();
+
+        editor.putString("Counter", counter);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        SharedPreferences preference = getPreferences(MODE_PRIVATE);
+        SharedPreferences.Editor editor = preferences.edit();
+
+        TextView tvCounter = (TextView)findViewById(R.id.tvCounter);
+        String counter = tvCounter.getText().toString();
+
+        editor.putString("Counter", counter);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        SharedPreferences preference = getPreferences(MODE_PRIVATE);
+        SharedPreferences.Editor editor = preferences.edit();
+
+        TextView tvCounter = (TextView)findViewById(R.id.tvCounter);
+        String counter = tvCounter.getText().toString();
+
+        editor.putString("Counter", counter);
+    }
+
+    @Override
+  public void onClick(View v){
+    if (v == plus){
+        counter++;
+        tvCounter.setText(Integer.toString(counter));
+    }
+    if (v == minus){
+        counter--;
+        tvCounter.setText(Integer.toString(counter));
+    }
+    if (v == empty){
+        counter = 0;
+        tvCounter.setText(Integer.toString(counter));
+    }
+    if (v == tileActivity){
+        Intent nextStartedActivity = new Intent(InitialActivity.this, TileActivity.class);
+        InitialActivity.this.startActivity(nextStartedActivity);
+    }
+  }
+
+
 }
diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java
index ef94dce..d0559c7 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..987a918 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -9,10 +9,68 @@
     tools:context="nyc.c4q.InitialActivity"
     android:id="@+id/activity_initial">
 
-    <TextView
-        android:id="@+id/text"
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="0dp"
+        android:id="@+id/counterLayout"
+        android:layout_weight="2">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="0dp"
+            android:layout_height="fill_parent"
+            android:id="@+id/counterButtonsLayout"
+            android:layout_weight="1">
+
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:text="+"
+                android:id="@+id/buttonPlus"
+                android:layout_weight="1"
+                android:textSize="40sp"
+                android:onClick="onClick" />
+
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:text="-"
+                android:id="@+id/buttonMinus"
+                android:layout_weight="1"
+                android:textSize="40sp"
+                android:onClick="onClick" />
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:text="0"
+            android:id="@+id/tvCounter"
+            android:layout_weight="1"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:textSize="40sp" />
+    </LinearLayout>
+
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:text="TileActivity"
+        android:id="@+id/buttonTileActivity"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:textSize="35sp"
+        android:textStyle="normal"
+        android:typeface="normal" />
+
+    <Button
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="InitialActivity"
-        />
+        android:layout_height="0dp"
+        android:text="Empty"
+        android:id="@+id/buttonEmpty"
+        android:layout_weight="1"
+        android:textSize="35sp"
+        android:onClick="onClick" />
+
 </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..a721fd9 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -5,11 +5,58 @@
     android:layout_height="match_parent"
     tools:context="nyc.c4q.TileActivity"
     android:id="@+id/activity_tile"
-    >
+    android:orientation="horizontal">
 
-    <TextView
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:text="TileActivity"/>
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/leftSide"
+        android:layout_weight="1">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:id="@+id/redView"
+            android:autoText="false"
+            android:background="@color/red"
+            android:layout_weight="40" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:id="@+id/greenView"
+            android:background="@color/green"
+            android:layout_weight="60" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/rightSide"
+        android:layout_weight="1">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:id="@+id/yellowView"
+            android:background="@color/yellow"
+            android:layout_weight="33" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:id="@+id/whiteView"
+            android:background="@color/white"
+            android:layout_weight="44" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:id="@+id/blueView"
+            android:background="@color/blue"
+            android:layout_weight="22" />
+    </LinearLayout>
 
 </LinearLayout>
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
new file mode 100644
index 0000000..d9f1046
--- /dev/null
+++ b/src/main/res/values/colors.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="red">#ffff0000</color>
+    <color name="green">#ff00ff00</color>
+    <color name="yellow">#ffffff00</color>
+    <color name="white">#ffffffff</color>
+    <color name="blue">#ff0000ff</color>
+</resources>
\ No newline at end of file
diff --git a/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java b/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
index de10077..ae9b679 100644
--- a/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
+++ b/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
@@ -7,6 +7,7 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;