diff --git a/app/build.gradle b/app/build.gradle
index a33aa16..df785b6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,6 +17,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    dataBinding {
+        enabled = true
+    }
 }
 
 dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ae66cc..e9f394d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,10 +8,9 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".controller.TicTacToeActivity">
+        <activity android:name=".view.TicTacToeActivity" android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
diff --git a/app/src/main/java/com/acme/tictactoe/controller/TicTacToeActivity.java b/app/src/main/java/com/acme/tictactoe/controller/TicTacToeActivity.java
deleted file mode 100644
index 84ba558..0000000
--- a/app/src/main/java/com/acme/tictactoe/controller/TicTacToeActivity.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.acme.tictactoe.controller;
-
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-
-import com.acme.tictactoe.R;
-
-public class TicTacToeActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.tictactoe);
-    }
-}
diff --git a/app/src/main/java/com/acme/tictactoe/model/Board.java b/app/src/main/java/com/acme/tictactoe/model/Board.java
index e65bab0..b3919c9 100644
--- a/app/src/main/java/com/acme/tictactoe/model/Board.java
+++ b/app/src/main/java/com/acme/tictactoe/model/Board.java
@@ -22,6 +22,7 @@ public Board() {
      */
     public void restart() {
         clearCells();
+        winner = null;
         currentTurn = Player.X;
         state = GameState.IN_PROGRESS;
     }
@@ -33,11 +34,17 @@ public void restart() {
      *
      * @param row 0..2
      * @param col 0..2
+     * @return the player that moved or null if we did not move anything.
      *
      */
-    public void mark( int row, int col ) {
+    public Player mark( int row, int col ) {
+
+        Player playerThatMoved = null;
+
         if(isValid(row, col)) {
+
             cells[row][col].setValue(currentTurn);
+            playerThatMoved = currentTurn;
 
             if(isWinningMoveByPlayer(currentTurn, row, col)) {
                 state = GameState.FINISHED;
@@ -48,6 +55,12 @@ public void mark( int row, int col ) {
                 flipCurrentTurn();
             }
         }
+
+        return playerThatMoved;
+    }
+
+    public Player valueAtCell(int row, int col) {
+        return cells[row][col].getValue();
     }
 
     public Player getWinner() {
diff --git a/app/src/main/java/com/acme/tictactoe/model/Player.java b/app/src/main/java/com/acme/tictactoe/model/Player.java
index 73130f8..3be3b79 100644
--- a/app/src/main/java/com/acme/tictactoe/model/Player.java
+++ b/app/src/main/java/com/acme/tictactoe/model/Player.java
@@ -1,3 +1,3 @@
 package com.acme.tictactoe.model;
 
-enum Player { X , O }
+public enum Player { X , O }
diff --git a/app/src/main/java/com/acme/tictactoe/view/TicTacToeActivity.java b/app/src/main/java/com/acme/tictactoe/view/TicTacToeActivity.java
new file mode 100644
index 0000000..a5a057b
--- /dev/null
+++ b/app/src/main/java/com/acme/tictactoe/view/TicTacToeActivity.java
@@ -0,0 +1,61 @@
+package com.acme.tictactoe.view;
+
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import com.acme.tictactoe.R;
+import com.acme.tictactoe.databinding.TictactoeBinding;
+import com.acme.tictactoe.viewmodel.TicTacToeViewModel;
+
+public class TicTacToeActivity extends AppCompatActivity {
+
+    TicTacToeViewModel viewModel = new TicTacToeViewModel();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        TictactoeBinding binding = DataBindingUtil.setContentView(this, R.layout.tictactoe);
+        binding.setViewModel(viewModel);
+        viewModel.onCreate();
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        viewModel.onPause();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        viewModel.onResume();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        viewModel.onDestroy();
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.menu_tictactoe, menu);
+        return true;
+    }
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_reset:
+                viewModel.onResetSelected();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/acme/tictactoe/viewmodel/TicTacToeViewModel.java b/app/src/main/java/com/acme/tictactoe/viewmodel/TicTacToeViewModel.java
new file mode 100644
index 0000000..d37b334
--- /dev/null
+++ b/app/src/main/java/com/acme/tictactoe/viewmodel/TicTacToeViewModel.java
@@ -0,0 +1,52 @@
+package com.acme.tictactoe.viewmodel;
+
+import android.databinding.ObservableArrayMap;
+import android.databinding.ObservableField;
+
+import com.acme.tictactoe.model.Board;
+import com.acme.tictactoe.model.Player;
+
+public class TicTacToeViewModel implements ViewModel {
+
+    private Board model;
+
+    public final ObservableArrayMap<String, String> cells = new ObservableArrayMap<>();
+    public final ObservableField<String> winner = new ObservableField<>();
+
+    public TicTacToeViewModel() {
+        model = new Board();
+    }
+
+    @Override
+    public void onCreate() {
+
+    }
+
+    @Override
+    public void onPause() {
+
+    }
+
+    @Override
+    public void onResume() {
+
+    }
+
+    @Override
+    public void onDestroy() {
+
+    }
+
+    public void onResetSelected() {
+        model.restart();
+        winner.set(null);
+        cells.clear();
+    }
+
+    public void onClickedCellAt(int row, int col) {
+        Player playerThatMoved = model.mark(row, col);
+        cells.put("" + row + col, playerThatMoved == null ? null : playerThatMoved.toString());
+        winner.set(model.getWinner() == null ? null : model.getWinner().toString());
+    }
+
+}
diff --git a/app/src/main/java/com/acme/tictactoe/viewmodel/ViewModel.java b/app/src/main/java/com/acme/tictactoe/viewmodel/ViewModel.java
new file mode 100644
index 0000000..63bcc09
--- /dev/null
+++ b/app/src/main/java/com/acme/tictactoe/viewmodel/ViewModel.java
@@ -0,0 +1,10 @@
+package com.acme.tictactoe.viewmodel;
+
+public interface ViewModel {
+
+    void onCreate();
+    void onPause();
+    void onResume();
+    void onDestroy();
+
+}
diff --git a/app/src/main/res/layout/tictactoe.xml b/app/src/main/res/layout/tictactoe.xml
index d97f0f8..e97c1e4 100644
--- a/app/src/main/res/layout/tictactoe.xml
+++ b/app/src/main/res/layout/tictactoe.xml
@@ -1,17 +1,104 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/tictactoe"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.acme.tictactoe.controller.TicTacToeActivity">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!" />
-</RelativeLayout>
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <import type="android.view.View" />
+        <variable name="viewModel" type="com.acme.tictactoe.viewmodel.TicTacToeViewModel" />
+    </data>
+
+    <LinearLayout
+        android:id="@+id/tictactoe"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        tools:context="com.acme.tictactoe.view.TicTacToeActivity">
+
+        <GridLayout
+            android:id="@+id/buttonGrid"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:columnCount="3"
+            android:rowCount="3">
+
+            <Button
+                style="@style/tictactoebutton"
+                android:onClick="@{() -> viewModel.onClickedCellAt(0,0)}"
+                android:text='@{viewModel.cells["00"]}' />
+
+            <Button
+                style="@style/tictactoebutton"
+                android:onClick="@{() -> viewModel.onClickedCellAt(0,1)}"
+                android:text='@{viewModel.cells["01"]}' />
+
+            <Button
+                style="@style/tictactoebutton"
+                android:onClick="@{() -> viewModel.onClickedCellAt(0,2)}"
+                android:text='@{viewModel.cells["02"]}' />
+
+            <Button
+                style="@style/tictactoebutton"
+                android:onClick="@{() -> viewModel.onClickedCellAt(1,0)}"
+                android:text='@{viewModel.cells["10"]}' />
+
+            <Button
+                style="@style/tictactoebutton"
+                android:onClick="@{() -> viewModel.onClickedCellAt(1,1)}"
+                android:text='@{viewModel.cells["11"]}' />
+
+            <Button
+                style="@style/tictactoebutton"
+                android:onClick="@{() -> viewModel.onClickedCellAt(1,2)}"
+                android:text='@{viewModel.cells["12"]}' />
+
+            <Button
+                style="@style/tictactoebutton"
+                android:onClick="@{() -> viewModel.onClickedCellAt(2,0)}"
+                android:text='@{viewModel.cells["20"]}' />
+
+            <Button
+                style="@style/tictactoebutton"
+                android:onClick="@{() -> viewModel.onClickedCellAt(2,1)}"
+                android:text='@{viewModel.cells["21"]}' />
+
+            <Button
+                style="@style/tictactoebutton"
+                android:onClick="@{() -> viewModel.onClickedCellAt(2,2)}"
+                android:text='@{viewModel.cells["22"]}' />
+
+        </GridLayout>
+
+        <LinearLayout
+            android:id="@+id/winnerPlayerViewGroup"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:visibility="@{viewModel.winner != null ? View.VISIBLE : View.GONE}"
+            tools:visibility="visible">
+
+            <TextView
+                android:id="@+id/winnerPlayerLabel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="20dp"
+                android:textSize="40sp"
+                android:text="@{viewModel.winner}"
+                tools:text="X" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/winner"
+                android:textSize="30sp" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+</layout>
diff --git a/app/src/main/res/menu/menu_tictactoe.xml b/app/src/main/res/menu/menu_tictactoe.xml
new file mode 100644
index 0000000..7cf7ca1
--- /dev/null
+++ b/app/src/main/res/menu/menu_tictactoe.xml
@@ -0,0 +1,11 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".view.TicTacToeActivity">
+
+    <item android:id="@+id/action_reset"
+        android:title="@string/action_reset"
+        android:orderInCategory="100"
+        app:showAsAction="ifRoom" />
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 47c8224..277ea4c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,5 +1,5 @@
 <resources>
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">44dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 40138db..afa6d27 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
 <resources>
     <string name="app_name">TicTacToe</string>
+    <string name="winner">Winner</string>
+    <string name="action_reset">Reset</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5885930..3023473 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,4 +8,10 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
+    <style name="tictactoebutton">
+        <item name="android:layout_width">100dp</item>
+        <item name="android:layout_height">100dp</item>
+        <item name="android:textSize">30sp</item>
+    </style>
+
 </resources>
diff --git a/app/src/test/java/com/acme/tictactoe/model/TicTacToeTests.java b/app/src/test/java/com/acme/tictactoe/model/TicTacToeTests.java
index 27c4268..0a14b4a 100644
--- a/app/src/test/java/com/acme/tictactoe/model/TicTacToeTests.java
+++ b/app/src/test/java/com/acme/tictactoe/model/TicTacToeTests.java
@@ -1,7 +1,5 @@
 package com.acme.tictactoe.model;
 
-import android.os.Build;
-
 import org.junit.Before;
 import org.junit.Test;
 
@@ -48,7 +46,7 @@ public void test3inRowAcrossTopForX() {
 
 
     /**
-     * This test will simulate and verify x is the winner.
+     * This test will simulate and verify o is the winner.
      *
      *    O | X | X
      *      | O |
diff --git a/app/src/test/java/com/acme/tictactoe/viewModel/TicTacToeViewModelTests.java b/app/src/test/java/com/acme/tictactoe/viewModel/TicTacToeViewModelTests.java
new file mode 100644
index 0000000..2009209
--- /dev/null
+++ b/app/src/test/java/com/acme/tictactoe/viewModel/TicTacToeViewModelTests.java
@@ -0,0 +1,88 @@
+package com.acme.tictactoe.viewModel;
+
+
+import com.acme.tictactoe.viewmodel.TicTacToeViewModel;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNull;
+
+/**
+ * There are a lot more tests we can and should write but for now, just a few smoke tests.
+ */
+public class TicTacToeViewModelTests {
+
+    private TicTacToeViewModel viewModel;
+
+    @Before
+    public void setup() {
+        viewModel = new TicTacToeViewModel();
+    }
+
+    private void clickAndAssertValueAt(int row, int col, String expectedValue) {
+        viewModel.onClickedCellAt(row, col);
+        assertEquals(expectedValue, viewModel.cells.get("" + row + col));
+    }
+
+    /**
+     * This test will simulate and verify x is the winner.
+     *
+     *    X | X | X
+     *    O |   |
+     *      | O |
+     */
+    @Test
+    public void test3inRowAcrossTopForX() {
+
+        clickAndAssertValueAt(0,0, "X");
+        assertNull(viewModel.winner.get());
+
+        clickAndAssertValueAt(1,0, "O");
+        assertNull(viewModel.winner.get());
+
+        clickAndAssertValueAt(0,1, "X");
+        assertNull(viewModel.winner.get());
+
+        clickAndAssertValueAt(2,1, "O");
+        assertNull(viewModel.winner.get());
+
+        clickAndAssertValueAt(0,2, "X");
+        assertEquals("X", viewModel.winner.get());
+
+    }
+
+
+    /**
+     * This test will simulate and verify o is the winner.
+     *
+     *    O | X | X
+     *      | O |
+     *      | X | O
+     */
+    @Test
+    public void test3inRowDiagonalFromTopLeftToBottomForO() {
+
+        clickAndAssertValueAt(0,1, "X");
+        assertNull(viewModel.winner.get());
+
+        clickAndAssertValueAt(0,0, "O");
+        assertNull(viewModel.winner.get());
+
+        clickAndAssertValueAt(2,1, "X");
+        assertNull(viewModel.winner.get());
+
+        clickAndAssertValueAt(1,1, "O");
+        assertNull(viewModel.winner.get());
+
+        clickAndAssertValueAt(0,2, "X");
+        assertNull(viewModel.winner.get());
+
+        clickAndAssertValueAt(2,2, "O");
+        assertEquals("O", viewModel.winner.get());
+
+    }
+
+
+}
diff --git a/build.gradle b/build.gradle
index 74b2ab0..b78a0b8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 04e285f..a7123b9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Thu Apr 06 09:34:46 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip