diff --git a/Libraries/Components/Switch/Switch.js b/Libraries/Components/Switch/Switch.js
new file mode 100644
index 000000000..adc5f232b
--- /dev/null
+++ b/Libraries/Components/Switch/Switch.js
@@ -0,0 +1,127 @@
+/**
+ * Copyright 2004-present Facebook. All Rights Reserved.
+ *
+ * @providesModule Switch
+ * @flow
+ */
+'use strict';
+
+var Platform = require('Platform');
+var NativeMethodsMixin = require('NativeMethodsMixin');
+var React = require('React');
+var StyleSheet = require('StyleSheet');
+
+var requireNativeComponent = require('requireNativeComponent');
+
+type DefaultProps = {
+  value: boolean;
+  disabled: boolean;
+};
+
+/**
+ * Universal two-state toggle component.
+ */
+var Switch = React.createClass({
+  propTypes: {
+    /**
+     * The value of the switch.  If true the switch will be turned on.
+     * Default value is false.
+     */
+    value: React.PropTypes.bool,
+    /**
+     * If true the user won't be able to toggle the switch.
+     * Default value is false.
+     */
+    disabled: React.PropTypes.bool,
+    /**
+     * Invoked with the new value when the value chages.
+     */
+    onValueChange: React.PropTypes.func,
+    /**
+     * Used to locate this view in end-to-end tests.
+     */
+    testID: React.PropTypes.string,
+
+    /**
+     * Background color when the switch is turned off.
+     * @platform ios
+     */
+    tintColor: React.PropTypes.string,
+    /**
+     * Background color when the switch is turned on.
+     * @platform ios
+     */
+    onTintColor: React.PropTypes.string,
+    /**
+     * Color of the foreground switch grip.
+     * @platform ios
+     */
+    thumbTintColor: React.PropTypes.string,
+  },
+
+  getDefaultProps: function(): DefaultProps {
+    return {
+      value: false,
+      disabled: false,
+    };
+  },
+
+  mixins: [NativeMethodsMixin],
+
+  _rctSwitch: {},
+  _onChange: function(event: Object) {
+    this.props.onChange && this.props.onChange(event);
+    this.props.onValueChange && this.props.onValueChange(event.nativeEvent.value);
+
+    // The underlying switch might have changed, but we're controlled,
+    // and so want to ensure it represents our value.
+    if (Platform.OS === 'android') {
+      this._rctSwitch.setNativeProps({on: this.props.value});
+    } else {
+      this._rctSwitch.setNativeProps({value: this.props.value});
+    }
+  },
+
+  render: function() {
+    var props = {...this.props};
+    props.onStartShouldSetResponder = () => true;
+    props.onResponderTerminationRequest = () => false;
+    if (Platform.OS === 'android') {
+      props.enabled = !this.props.disabled;
+      props.on = this.props.value;
+      props.style = [styles.rctSwitchAndroid, this.props.style];
+    } else if (Platform.OS === 'ios') {
+      props.style = [styles.rctSwitchIOS, this.props.style];
+    }
+    return (
+      <RCTSwitch
+        {...props}
+        ref={(ref) => { this._rctSwitch = ref; }}
+        onChange={this._onChange}
+      />
+    );
+  },
+});
+
+var styles = StyleSheet.create({
+  rctSwitchIOS: {
+    height: 31,
+    width: 51,
+  },
+  rctSwitchAndroid: {
+    height: 27,
+    width: 40,
+  },
+});
+
+if (Platform.OS === 'android') {
+  var RCTSwitch = requireNativeComponent('AndroidSwitch', null, {
+    nativeOnly: { onChange: true, on: true, enabled: true }
+  });
+} else {
+  var RCTSwitch = requireNativeComponent('RCTSwitch', Switch, {
+    nativeOnly: { onChange: true }
+  });
+}
+
+module.exports = Switch;
diff --git a/Libraries/react-native/react-native.js b/Libraries/react-native/react-native.js
index fde908361..2b418e3a0 100644
--- a/Libraries/react-native/react-native.js
+++ b/Libraries/react-native/react-native.js
@@ -35,6 +35,7 @@ var ReactNative = Object.assign(Object.create(require('React')), {
   SegmentedControlIOS: require('SegmentedControlIOS'),
   SliderIOS: require('SliderIOS'),
   SnapshotView: require('SnapshotView'),
+  Switch: require('Switch'),
   SwitchAndroid: require('SwitchAndroid'),
   SwitchIOS: require('SwitchIOS'),
   TabBarIOS: require('TabBarIOS'),