diff --git a/ionic/components/switch/switch.js b/ionic/components/switch/switch.js
index 82d46919b8..6c7e54c3e5 100644
--- a/ionic/components/switch/switch.js
+++ b/ionic/components/switch/switch.js
@@ -4,12 +4,14 @@ import {dom} from 'ionic/util';
 import {IonicComponent} from 'ionic/config/component'
 import {Button} from 'ionic/components/button/button'
 
-
 @Component({
   selector: 'ion-switch',
   properties: {
     checked: 'checked'
-  }
+  },
+  hostListeners: {
+    'click': 'switchClicked($event)'
+  },
   /*
   TODO: For some reason this triggers a 'TypeError: array.map is not a function'
   events: {
@@ -25,7 +27,7 @@ import {Button} from 'ionic/components/button/button'
       <content></content>
     </div>
 
-    <div class="item-media media-switch">
+    <div class="item-media media-switch" (^click)="onClick($event)">
       <div class="switch-toggle"></div>
     </div>
 
@@ -33,37 +35,54 @@ import {Button} from 'ionic/components/button/button'
 })
 export class Switch {
   constructor(
-    @NgElement() element:NgElement
+    @NgElement() element:NgElement,
+    cd: ControlDirective
     // @PropertySetter('attr.role') setAriaRole: Function,
-    // @PropertySetter('attr.aria-checked') setChecked: Function,
+    // @PropertySetter('attr.aria-checked') setChecked: Function
     // @PropertySetter('attr.aria-invalid') setInvalid: Function,
     // @PropertySetter('attr.aria-disabled') setDisabled: Function
   ) {
     this.domElement = element.domElement
     this.config = Switch.config.invoke(this)
+    this.controlDirective = cd;
+    cd.valueAccessor = this;
 
+    // TODO: These are temporary until we figure out what to do
+    // with @PropertSetter
     let setAriaRole = (v) => this.domElement.setAttribute('aria-role', v)
     let setAriaChecked = (v) => this.domElement.setAttribute('aria-checked', v)
     let setAriaInvalid = (v) => this.domElement.setAttribute('aria-invalid', v)
     let setAriaDisabled = (v) => this.domElement.setAttribute('aria-disabled', v)
 
+    //let setChecked = (v) => this.domElement.setAttribute('checked', v);
+
     this.domElement.classList.add('item')
 
     // TODO: These rely on the commented-out PropertySetter's above
     //setAriaRole('checkbox')
     //setInvalid('false')
     //setDisabled('false')
-    //this.setChecked = setChecked
+    this.setCheckedProperty = setAriaChecked
   }
 
+  /**
+   * Much like ngModel, this is called from our valueAccessor for the attached
+   * ControlDirective to update the value internally.
+   */
+  writeValue(value) {
+    this.checked = value;
+  }
+
+
   set checked(checked) {
     this._checked = checked
-    this.setChecked(checked)
+    this.setCheckedProperty(checked)
+    this.controlDirective._control().updateValue(this._checked);
   }
   get checked() {
     return this._checked
   }
-  onClick() {
+  switchClicked(event) {
     this.checked = !this.checked;
   }
 }
diff --git a/ionic/components/switch/test/basic/main.html b/ionic/components/switch/test/basic/main.html
index daae14ff6a..a17edbe532 100644
--- a/ionic/components/switch/test/basic/main.html
+++ b/ionic/components/switch/test/basic/main.html
@@ -10,6 +10,8 @@
       </ion-switch>
 
     </ion-list>
+
+    Is fun enabled? <b>{{form.controls.enableFun.value}}</b>
   </form>
 
 </ion-content>