diff --git a/.eslintrc.json b/.eslintrc.json
index e1065ce..3cfc9ab 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -2,7 +2,8 @@
   "extends": "eslint-config-shakacode",
 
   "plugins": [
-    "react-native"
+    "react-native",
+    "flowtype"
   ],
 
   "env": {
@@ -17,6 +18,9 @@
         "extensions": [".js", ".android.js", ".ios.js"],
         "moduleDirectory": ["..", "node_modules"]
       }
+    },
+    "flowtype": {
+      "onlyFilesWithFlowAnnotation": true
     }
   },
   
@@ -31,6 +35,27 @@
     "react-native/no-color-literals": 2,
     "react/jsx-no-bind": 1,
     "react/prefer-stateless-function": 1,
-    "react/jsx-indent": 1
+    "react/jsx-indent": 1,
+
+    "flowtype/require-parameter-type": 1,
+    "flowtype/require-return-type": [
+      0,
+      "always",
+      {
+        "annotateUndefined": "never"
+      }
+    ],
+    "flowtype/space-after-type-colon": [
+      1,
+      "always"
+    ],
+    "flowtype/space-before-type-colon": [
+      1,
+      "never"
+    ],
+    "flowtype/type-id-match": [
+      1,
+      "^([A-Z][a-z0-9]+)+Type$"
+    ]
   }
 }
diff --git a/.flowconfig b/.flowconfig
index e28e2f5..9881873 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -8,13 +8,13 @@
 
 # Ignore malformed json
 .*/node_modules/y18n/test/.*\.json
+.*/node_modules/jsonlint/test/.*\.json
 
 [include]
 
 [libs]
 node_modules/react-native/Libraries/react-native/react-native-interface.js
 node_modules/react-native/flow
-flow/
 
 [options]
 module.system=haste
@@ -22,8 +22,6 @@ module.system=haste
 esproposal.class_static_fields=enable
 esproposal.class_instance_fields=enable
 
-experimental.strict_type_args=true
-
 munge_underscores=true
 
 module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub'
@@ -38,4 +36,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-7]\\|1[0-9]\\|[0-9
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 
 [version]
-^0.27.0
+^0.22.1
diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 0000000..8a0704f
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,18 @@
+{
+  "preset": "airbnb",
+  "fileExtensions": [
+    ".js",
+    ".jsx"
+  ],
+  "excludeFiles": [
+    "ios/**",
+    "android/**",
+    "node_modules/**"
+  ],
+  "esprima": "babel-jscs",
+  "validateQuoteMarks": {
+    "mark": "'",
+    "escape": true,
+    "ignoreJSX": true
+  }
+}
diff --git a/app/App.js b/app/App.js
index e68429f..a64bc9a 100644
--- a/app/App.js
+++ b/app/App.js
@@ -1,3 +1,4 @@
+// @flow
 import React from 'react';
 import { Provider } from 'react-redux';
 
diff --git a/app/components/AddComment/AddComment.js b/app/components/AddComment/AddComment.js
index f10bfd2..9d926ee 100644
--- a/app/components/AddComment/AddComment.js
+++ b/app/components/AddComment/AddComment.js
@@ -2,7 +2,8 @@ import React, { PropTypes } from 'react';
 import { Text, View, TextInput } from 'react-native';
 import _ from 'lodash/fp';
 
-import ActivityIndicator from 'ReactNativeTutorial/app/components/ActivityIndicator/ActivityIndicator';
+import ActivityIndicator from
+  'ReactNativeTutorial/app/components/ActivityIndicator/ActivityIndicator';
 import withFormState from 'ReactNativeTutorial/app/hocs/withFormState';
 import withAddCommentHandlers from 'ReactNativeTutorial/app/hocs/withAddCommentHandlers';
 import Button from 'ReactNativeTutorial/app/components/Button/Button';
diff --git a/app/components/Comments/Comments.js b/app/components/Comments/Comments.js
index 7df93dd..740bfac 100644
--- a/app/components/Comments/Comments.js
+++ b/app/components/Comments/Comments.js
@@ -8,7 +8,8 @@ import _ from 'lodash/fp';
 
 import Comment from 'ReactNativeTutorial/app/components/Comment/Comment';
 import Button from 'ReactNativeTutorial/app/components/Button/Button';
-import ActivityIndicator from 'ReactNativeTutorial/app/components/ActivityIndicator/ActivityIndicator';
+import ActivityIndicator from
+  'ReactNativeTutorial/app/components/ActivityIndicator/ActivityIndicator';
 import withRemoteDataSource from 'ReactNativeTutorial/app/hocs/withRemoteDataSource';
 import routes from 'ReactNativeTutorial/app/constants/routes';
 import styles from './CommentsStyle';
@@ -21,6 +22,7 @@ const Comments = (props) => (
           props.actions.resetErrorState();
           props.remoteDataSourceFetch();
         }}
+
         text="Reload"
       />
       <Button
@@ -28,6 +30,7 @@ const Comments = (props) => (
           props.actions.resetErrorState();
           props.navigator.push({ path: routes.ADD_COMMENT });
         }}
+
         text="Add Comment"
       />
     </View>
diff --git a/app/hocs/withAddCommentHandlers.js b/app/hocs/withAddCommentHandlers.js
index 4c0e9da..32f19c9 100644
--- a/app/hocs/withAddCommentHandlers.js
+++ b/app/hocs/withAddCommentHandlers.js
@@ -1,25 +1,22 @@
-import React, { PropTypes } from 'react';
+// @flow
+import React from 'react';
 import _ from 'lodash/fp';
 
-const withAddCommentHandlers = Component => class extends React.Component {
-
-  static propTypes = {
-    navigator: PropTypes.object.isRequired,
-    getState: PropTypes.func.isRequired,
-    actions: PropTypes.shape({
-      submitCommentRequest: PropTypes.func.isRequired,
-      resetErrorState: PropTypes.func.isRequired,
-    }),
-    error: PropTypes.string,
-    isSaving: PropTypes.bool,
-  }
-
-  constructor(props) {
+const withAddCommentHandlers = (
+  Component: any
+) => class extends React.Component {
+  constructor(
+    props: { navigator: Object,
+      getState: Function,
+      actions: { submitCommentRequest: Function,
+        resetErrorState: Function },
+      error: string,
+      isSaving: bool }) {
     super(props);
     _.bindAll(['addComment', 'cancel'], this);
   }
 
-  componentWillReceiveProps(nextProps) {
+  componentWillReceiveProps(nextProps: {}) {
     if (this.props.isSaving && !nextProps.isSaving && !nextProps.error) {
       this.props.actions.resetErrorState();
       this.props.navigator.pop();
@@ -36,7 +33,7 @@ const withAddCommentHandlers = Component => class extends React.Component {
   }
 
   render() {
-    return <Component {...this.props} addComment={this.addComment} cancel={this.cancel} />;
+    return < Component {...this.props} addComment={this.addComment} cancel={this.cancel} />;
   }
 };
 
diff --git a/app/hocs/withRemoteDataSource.js b/app/hocs/withRemoteDataSource.js
index ff9b3c6..f2407d1 100644
--- a/app/hocs/withRemoteDataSource.js
+++ b/app/hocs/withRemoteDataSource.js
@@ -14,7 +14,7 @@ const withRemoteDataSource = (selector, Component) => class extends React.Compon
 
   static propTypes = {
     remoteDataSourceFetch: PropTypes.func.isRequired,
-  }
+  };
 
   constructor(props) {
     super(props);
diff --git a/app/libs/api/index.js b/app/libs/api/index.js
index b5a1242..81aedf8 100644
--- a/app/libs/api/index.js
+++ b/app/libs/api/index.js
@@ -1,5 +1,6 @@
 // SAME URL for both post and get
 const API_URL = 'http://www.reactrails.com/comments.json';
+
 // const API_URL = 'http://localhost:3000/comments.json';
 
 export default {
diff --git a/app/libs/utils/redux.js b/app/libs/utils/redux.js
index 423b9e0..f694689 100644
--- a/app/libs/utils/redux.js
+++ b/app/libs/utils/redux.js
@@ -5,7 +5,7 @@ export const makeActionCreator =
   (type: string, ...argNames) => (...args) => _.merge({ type }, _.zipObject(argNames, args));
 
 export const createReducer = ($$initialState: $$Map, handlers: Object) =>
-  ($$state : $$Map = $$initialState, action : { type : string }) =>
+  ($$state : $$Map = $$initialState, action: { type: string }) =>
     (
       action && handlers.hasOwnProperty(action.type) ?
       handlers[action.type]($$state, action) :
diff --git a/app/reducers/commentsReducer.js b/app/reducers/commentsReducer.js
index f493515..a725ed9 100644
--- a/app/reducers/commentsReducer.js
+++ b/app/reducers/commentsReducer.js
@@ -1,3 +1,4 @@
+// @flow
 /* eslint new-cap: 0 */
 
 import Immutable, { Map as $$Map } from 'immutable';
@@ -30,11 +31,11 @@ export const commentsHandlers = {
   },
 
   [actionTypes.SUBMIT_COMMENT_SUCCESS]($$state: $$Map, action: { comment: Object }) {
-    return $$state.withMutations(state => (
+    return $$state.withMutations((state: $$Map) => (
       state
         .updateIn(
           ['$$comments'],
-          $$comments => $$comments.unshift(Immutable.fromJS(action.comment))
+          ($$comments: Object) => $$comments.unshift(Immutable.fromJS(action.comment))
         )
         .merge({
           error: null,
diff --git a/app/sagas/submitComment.js b/app/sagas/submitComment.js
index 7f6fe2e..9a8caf6 100644
--- a/app/sagas/submitComment.js
+++ b/app/sagas/submitComment.js
@@ -12,6 +12,7 @@ export function* submitComment(action) {
     if (!comment.hasOwnProperty('author') || !comment.hasOwnProperty('text')) {
       throw errors.UNEXPECTED_SERVER_RESPONSE;
     }
+
     yield put({ type: actionTypes.SUBMIT_COMMENT_SUCCESS, comment });
   } catch (e) {
     yield put({ type: actionTypes.SUBMIT_COMMENT_FAILURE, error: e.message || e });
diff --git a/ios/ReactNativeTutorial.xcodeproj/project.pbxproj b/ios/ReactNativeTutorial.xcodeproj/project.pbxproj
index dea1f62..8c8ccfd 100644
--- a/ios/ReactNativeTutorial.xcodeproj/project.pbxproj
+++ b/ios/ReactNativeTutorial.xcodeproj/project.pbxproj
@@ -106,17 +106,17 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = main.jsbundle; path = main.jsbundle; sourceTree = "<group>"; };
-		00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = ../node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj; sourceTree = "<group>"; };
-		00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTGeolocation.xcodeproj; path = ../node_modules/react-native/Libraries/Geolocation/RCTGeolocation.xcodeproj; sourceTree = "<group>"; };
-		00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = ../node_modules/react-native/Libraries/Image/RCTImage.xcodeproj; sourceTree = "<group>"; };
-		00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = ../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj; sourceTree = "<group>"; };
-		00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = ../node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj; sourceTree = "<group>"; };
+		008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
+		00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = "../node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj"; sourceTree = "<group>"; };
+		00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTGeolocation.xcodeproj; path = "../node_modules/react-native/Libraries/Geolocation/RCTGeolocation.xcodeproj"; sourceTree = "<group>"; };
+		00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = "../node_modules/react-native/Libraries/Image/RCTImage.xcodeproj"; sourceTree = "<group>"; };
+		00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = "../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj"; sourceTree = "<group>"; };
+		00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = "../node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj"; sourceTree = "<group>"; };
 		00E356EE1AD99517003FC87E /* ReactNativeTutorialTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ReactNativeTutorialTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* ReactNativeTutorialTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ReactNativeTutorialTests.m; sourceTree = "<group>"; };
-		139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = ../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj; sourceTree = "<group>"; };
-		139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = ../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj; sourceTree = "<group>"; };
+		139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = "<group>"; };
+		139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* ReactNativeTutorial.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ReactNativeTutorial.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ReactNativeTutorial/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = ReactNativeTutorial/AppDelegate.m; sourceTree = "<group>"; };
@@ -124,9 +124,9 @@
 		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = ReactNativeTutorial/Images.xcassets; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ReactNativeTutorial/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ReactNativeTutorial/main.m; sourceTree = "<group>"; };
-		146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../node_modules/react-native/React/React.xcodeproj; sourceTree = "<group>"; };
-		78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = ../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj; sourceTree = "<group>"; };
-		832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../node_modules/react-native/Libraries/Text/RCTText.xcodeproj; sourceTree = "<group>"; };
+		146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
+		78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
+		832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -352,13 +352,16 @@
 		83CBB9F71A601CBA00E9B192 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0610;
+				LastUpgradeCheck = 0730;
 				ORGANIZATIONNAME = Facebook;
 				TargetAttributes = {
 					00E356ED1AD99517003FC87E = {
 						CreatedOnToolsVersion = 6.2;
 						TestTargetID = 13B07F861A680F5B00A75B9A;
 					};
+					13B07F861A680F5B00A75B9A = {
+						DevelopmentTeam = YAX6XB3T67;
+					};
 				};
 			};
 			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "ReactNativeTutorial" */;
@@ -528,7 +531,6 @@
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/packager/react-native-xcode.sh";
-			showEnvVarsInLog = 1;
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -584,6 +586,7 @@
 				INFOPLIST_FILE = ReactNativeTutorialTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ReactNativeTutorial.app/ReactNativeTutorial";
 			};
@@ -597,6 +600,7 @@
 				INFOPLIST_FILE = ReactNativeTutorialTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ReactNativeTutorial.app/ReactNativeTutorial";
 			};
@@ -606,19 +610,21 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				DEAD_CODE_STRIPPING = NO;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../node_modules/react-native/React/**",
 				);
-				INFOPLIST_FILE = "ReactNativeTutorial/Info.plist";
+				INFOPLIST_FILE = ReactNativeTutorial/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-        OTHER_LDFLAGS = (
+				OTHER_LDFLAGS = (
 					"$(inherited)",
-          "-ObjC",
-          "-lc++",
-        );
+					"-ObjC",
+					"-lc++",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.shakacode.rncomments;
 				PRODUCT_NAME = ReactNativeTutorial;
 			};
 			name = Debug;
@@ -627,18 +633,21 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: ShakaCode, LLC (YAX6XB3T67)";
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../node_modules/react-native/React/**",
 				);
-				INFOPLIST_FILE = "ReactNativeTutorial/Info.plist";
+				INFOPLIST_FILE = ReactNativeTutorial/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-        OTHER_LDFLAGS = (
+				OTHER_LDFLAGS = (
 					"$(inherited)",
-          "-ObjC",
-          "-lc++",
-        );
+					"-ObjC",
+					"-lc++",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.shakacode.rncomments;
 				PRODUCT_NAME = ReactNativeTutorial;
 			};
 			name = Release;
@@ -663,6 +672,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
diff --git a/ios/ReactNativeTutorial.xcodeproj/xcshareddata/xcschemes/ReactNativeTutorial.xcscheme b/ios/ReactNativeTutorial.xcodeproj/xcshareddata/xcschemes/ReactNativeTutorial.xcscheme
index 78d0255..c05a99c 100644
--- a/ios/ReactNativeTutorial.xcodeproj/xcshareddata/xcschemes/ReactNativeTutorial.xcscheme
+++ b/ios/ReactNativeTutorial.xcodeproj/xcshareddata/xcschemes/ReactNativeTutorial.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -62,15 +62,18 @@
             ReferencedContainer = "container:ReactNativeTutorial.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
@@ -86,10 +89,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
diff --git a/ios/ReactNativeTutorial/Info.plist b/ios/ReactNativeTutorial/Info.plist
index 377d08d..c2b1514 100644
--- a/ios/ReactNativeTutorial/Info.plist
+++ b/ios/ReactNativeTutorial/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -22,6 +22,28 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSExceptionDomains</key>
+		<dict>
+			<key>localhost</key>
+			<dict>
+				<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+			</dict>
+			<key>reactrails.com</key>
+			<dict>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+				<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSTemporaryExceptionMinimumTLSVersion</key>
+				<string>TLSv1.1</string>
+			</dict>
+		</dict>
+	</dict>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string></string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
@@ -36,30 +58,5 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string></string>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSExceptionDomains</key>
-		<dict>
-			<key>reactrails.com</key>
-      <dict>
-        <!--Include to allow subdomains-->
-        <key>NSIncludesSubdomains</key>
-        <true/>
-        <!--Include to allow HTTP requests-->
-        <key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
-        <true/>
-        <!--Include to specify minimum TLS version-->
-        <key>NSTemporaryExceptionMinimumTLSVersion</key>
-        <string>TLSv1.1</string>
-      </dict>
-			<key>localhost</key>
-			<dict>
-				<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-			</dict>
-		</dict>
-	</dict>
 </dict>
 </plist>
diff --git a/ios/ReactNativeTutorialTests/Info.plist b/ios/ReactNativeTutorialTests/Info.plist
index 886825c..ba72822 100644
--- a/ios/ReactNativeTutorialTests/Info.plist
+++ b/ios/ReactNativeTutorialTests/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/package.json b/package.json
index 09fee44..ab9502b 100644
--- a/package.json
+++ b/package.json
@@ -6,31 +6,36 @@
     "start": "node node_modules/react-native/local-cli/cli.js start",
     "test": "mocha --opts test/mocha.opts 'test/**/*.spec.js'",
     "test_android": "env MOCHA_PLATFORM=android mocha --opts test/mocha.opts 'test/**/*.spec.js'",
-    "lint": "node_modules/eslint/bin/eslint.js ."
+    "eslint": "eslint --ext .js,.jsx .",
+    "jscs": "jscs .",
+    "lint": "npm run eslint"
   },
   "dependencies": {
     "babel-polyfill": "^6.9.1",
     "immutable": "^3.8.1",
     "lodash": "^4.13.1",
     "react": "^15.2.1",
-    "react-native": "0.29.0",
-    "react-redux": "^4.4.2",
-    "redux": "^3.4.0",
+    "react-native": "0.30.0",
+    "react-redux": "^4.4.5",
+    "redux": "^3.5.2",
     "redux-saga": "^0.11.0",
     "reselect": "^2.5.3"
   },
   "devDependencies": {
-    "babel-core": "^6.10.4",
+    "babel-core": "^6.11.4",
     "babel-resolver": "0.0.18",
     "chai": "^3.5.0",
-    "enzyme": "2.3.0",
-    "eslint": "2.9.0",
+    "enzyme": "2.4.1",
+    "eslint": "3.1.1",
     "eslint-config-shakacode": "5.0.0",
-    "eslint-plugin-import": "1.10.2",
-    "eslint-plugin-jsx-a11y": "1.2.0",
+    "eslint-plugin-flowtype": "^2.3.1",
+    "eslint-plugin-import": "1.11.1",
+    "eslint-plugin-jsx-a11y": "2.0.1",
     "eslint-plugin-react": "5.2.2",
     "eslint-plugin-react-native": "^1.1.0",
-    "mocha": "^2.4.5",
+    "flow": "^0.2.3",
+    "jscs": "^2.11.0",
+    "mocha": "^2.5.3",
     "react-addons-test-utils": "15.2.1",
     "react-dom": "15.2.1",
     "redux-logger": "^2.6.1"
diff --git a/test/libs/utils/redux.spec.js b/test/libs/utils/redux.spec.js
index 47ffab4..cdcc60b 100644
--- a/test/libs/utils/redux.spec.js
+++ b/test/libs/utils/redux.spec.js
@@ -1,3 +1,4 @@
+// @flow
 import { makeActionCreator, createReducer } from '../../../app/libs/utils/redux';
 import { expect } from 'chai';
 import Immutable from 'immutable';
@@ -21,8 +22,9 @@ describe('redux', () => {
     it('creates a reducers from a hash of individual reducers functions', () => {
       const $$initialState = Immutable.fromJS([2]);
       const handlers = {
-        ADD_ITEM: ($$state) => $$state.push(0),
-        INCREASE: ($$state, action: { index: number }) => $$state.update(action.index, x => x + 1),
+        ADD_ITEM: ($$state: Object) => $$state.push(0),
+        INCREASE: ($$state: Object, action: { index: number }) =>
+          $$state.update(action.index, (x: number) => x + 1),
       };
       const reducer = createReducer($$initialState, handlers);
 
diff --git a/test/sagas/fetchComments.spec.js b/test/sagas/fetchComments.spec.js
index 1dcd8bd..d24cbf0 100644
--- a/test/sagas/fetchComments.spec.js
+++ b/test/sagas/fetchComments.spec.js
@@ -12,7 +12,7 @@ describe('fetchComments', () => {
       const effect = iterator.next(
           { comments:
             ['comment1', 'comment2'],
-          },
+      },
       ).value;
       expect(effect).to.deep.equal(
         put({