diff --git a/app/account/account.html b/app/account/account.html
index 089482cd..79f1d458 100644
--- a/app/account/account.html
+++ b/app/account/account.html
@@ -21,11 +21,6 @@ <h2>Account</h2>
     <fieldset>
         <legend>Change Password</legend>
 
-        <label>
-            <span>Old Password:</span>
-            <input type="password" ng-keypress="clear()" ng-model="oldpass"/>
-        </label>
-
         <label>
             <span>New Password:</span>
             <input type="password" ng-keypress="clear()" ng-model="newpass"/>
@@ -36,7 +31,7 @@ <h2>Account</h2>
             <input type="password" ng-keypress="clear()" ng-model="confirm"/>
         </label>
 
-        <button ng-click="changePassword(oldpass, newpass, confirm)">change password</button>
+        <button ng-click="changePassword(newpass, confirm)">change password</button>
 
         <p class="error" ng-show="err">{{err}}</p>
         <p class="good" ng-show="msg">{{msg}}</p>
@@ -52,16 +47,11 @@ <h2>Account</h2>
             <input type="text" ng-keypress="clear()" ng-model="newEmail"/>
         </label>
 
-        <label>
-            <span>Password:</span>
-            <input type="password" ng-keypress="clear()" ng-model="pass"/>
-        </label>
-
-        <button ng-click="changeEmail(pass, newEmail)">update email</button>
+        <button ng-click="changeEmail(newEmail)">update email</button>
 
         <p class="error" ng-show="emailerr">{{emailerr}}</p>
         <p class="good" ng-show="emailmsg">{{emailmsg}}</p>
     </fieldset>
 </form>
 
-<button ng-click="logout()">Log Out</button>
\ No newline at end of file
+<button ng-click="logout()">Log Out</button>
diff --git a/app/account/account.js b/app/account/account.js
index d554c098..f5f9041a 100644
--- a/app/account/account.js
+++ b/app/account/account.js
@@ -1,33 +1,30 @@
 (function (angular) {
   "use strict";
 
-  var app = angular.module('myApp.account', ['firebase', 'firebase.utils', 'firebase.auth', 'ngRoute']);
+  var app = angular.module('myApp.account', ['firebase', 'firebase.appauth', 'ngRoute']);
 
-  app.controller('AccountCtrl', ['$scope', 'Auth', 'fbutil', 'user', '$location', '$firebaseObject',
-    function($scope, Auth, fbutil, user, $location, $firebaseObject) {
-      var unbind;
+  app.controller('AccountCtrl', ['$scope', 'Auth', '$location', '$firebaseObject',
+    function($scope, Auth, $location, $firebaseObject) {
       // create a 3-way binding with the user profile object in Firebase
-      var profile = $firebaseObject(fbutil.ref('users', user.uid));
-      profile.$bindTo($scope, 'profile').then(function(ub) { unbind = ub; });
+      $scope.profile = Auth.$getAuth();
+      console.log("firebase.User = ",JSON.stringify($scope.profile));
 
       // expose logout function to scope
       $scope.logout = function() {
-        if( unbind ) { unbind(); }
-        profile.$destroy();
-        Auth.$unauth();
+        Auth.$signOut();
         $location.path('/login');
       };
 
-      $scope.changePassword = function(pass, confirm, newPass) {
+      $scope.changePassword = function(newPass, confirm) {
         resetMessages();
-        if( !pass || !confirm || !newPass ) {
+        if( !confirm || !newPass ) {
           $scope.err = 'Please fill in all password fields';
         }
         else if( newPass !== confirm ) {
           $scope.err = 'New pass and confirm do not match';
         }
         else {
-          Auth.$changePassword({email: profile.email, oldPassword: pass, newPassword: newPass})
+          Auth.$updatePassword(newPass)
             .then(function() {
               $scope.msg = 'Password changed';
             }, function(err) {
@@ -38,16 +35,9 @@
 
       $scope.clear = resetMessages;
 
-      $scope.changeEmail = function(pass, newEmail) {
+      $scope.changeEmail = function(newEmail) {
         resetMessages();
-        var oldEmail = profile.email;
-        Auth.$changeEmail({oldEmail: oldEmail, newEmail: newEmail, password: pass})
-          .then(function() {
-            // store the new email address in the user's profile
-            return fbutil.handler(function(done) {
-              fbutil.ref('users', user.uid, 'email').set(newEmail, done);
-            });
-          })
+        Auth.$updateEmail(newEmail)
           .then(function() {
             $scope.emailmsg = 'Email changed';
           }, function(err) {
@@ -74,4 +64,4 @@
     })
   }]);
 
-})(angular);
\ No newline at end of file
+})(angular);
diff --git a/app/app.js b/app/app.js
index d038c71f..a1f47995 100644
--- a/app/app.js
+++ b/app/app.js
@@ -2,8 +2,12 @@
 
 // Declare app level module which depends on filters, and services
 angular.module('myApp', [
+    'firebase',
     'myApp.config',
     'myApp.security',
+
+    'firebase.appauth',
+
     'myApp.home',
     'myApp.account',
     'myApp.chat',
@@ -11,6 +15,14 @@ angular.module('myApp', [
   ])
   
   .config(['$routeProvider', function ($routeProvider) {
+    // Initialize Firebase
+    var config = {
+       apiKey: PRIVATE.firebase_api,
+       authDomain: PRIVATE.firebase_authDomain,
+       databaseURL: PRIVATE.firebase_databaseURL
+    };
+    firebase.initializeApp(config);
+
     $routeProvider.otherwise({
       redirectTo: '/home'
     });
@@ -18,7 +30,7 @@ angular.module('myApp', [
   
   .run(['$rootScope', 'Auth', function($rootScope, Auth) {
     // track status of authentication
-    Auth.$onAuth(function(user) {
+    Auth.$onAuthStateChanged(function(user) {
       $rootScope.loggedIn = !!user;
     });
   }]);
diff --git a/app/chat/chat.js b/app/chat/chat.js
index a720fe35..c96b7407 100644
--- a/app/chat/chat.js
+++ b/app/chat/chat.js
@@ -1,7 +1,7 @@
 (function (angular) {
   "use strict";
 
-  var app = angular.module('myApp.chat', ['ngRoute', 'firebase.utils', 'firebase']);
+  var app = angular.module('myApp.chat', ['ngRoute', 'firebase']);
 
   app.controller('ChatCtrl', ['$scope', 'messageList', function($scope, messageList) {
       $scope.messages = messageList;
@@ -12,8 +12,8 @@
       };
     }]);
 
-  app.factory('messageList', ['fbutil', '$firebaseArray', function(fbutil, $firebaseArray) {
-    var ref = fbutil.ref('messages').limitToLast(10);
+  app.factory('messageList', ['$firebaseArray', function($firebaseArray) {
+    var ref = firebase.database().ref('messages').limitToLast(10);;
     return $firebaseArray(ref);
   }]);
 
@@ -24,4 +24,4 @@
     });
   }]);
 
-})(angular);
\ No newline at end of file
+})(angular);
diff --git a/app/components/auth/auth.js b/app/components/auth/auth.js
index 7af43941..0be05905 100644
--- a/app/components/auth/auth.js
+++ b/app/components/auth/auth.js
@@ -1,4 +1,6 @@
-angular.module('firebase.auth', ['firebase', 'firebase.utils'])
-  .factory('Auth', ['$firebaseAuth', 'fbutil', function($firebaseAuth, fbutil) {
-    return $firebaseAuth(fbutil.ref());
+angular.module('firebase.appauth', ['firebase'])
+  // renamed as per 
+  // https://stackoverflow.com/questions/39244924/angularfire-and-firebase-upgrade-error-unknown-provider-firebaseauthprovider#39249547
+  .factory('Auth', ['$firebaseAuth', function($firebaseAuth) {
+    return $firebaseAuth();
   }]);
diff --git a/app/components/ngcloak/ngcloak-decorator.js b/app/components/ngcloak/ngcloak-decorator.js
index 437f3558..2919a018 100644
--- a/app/components/ngcloak/ngcloak-decorator.js
+++ b/app/components/ngcloak/ngcloak-decorator.js
@@ -16,7 +16,7 @@ angular.module('myApp')
         // make a copy of the old directive
         var _compile = directive.compile;
         directive.compile = function(element, attr) {
-          Auth.$waitForAuth().then(function() {
+          Auth.$waitForSignIn().then(function() {
             // after auth, run the original ng-cloak directive
             _compile.call(directive, element, attr);
           });
@@ -24,4 +24,4 @@ angular.module('myApp')
         // return the modified directive
         return $delegate;
       }]);
-  }]);
\ No newline at end of file
+  }]);
diff --git a/app/components/security/security.js b/app/components/security/security.js
index e0b30c03..7bc35503 100644
--- a/app/components/security/security.js
+++ b/app/components/security/security.js
@@ -5,7 +5,7 @@
   // to be used by authRequired() in the services below
   var securedRoutes = [];
 
-  angular.module('myApp.security', ['ngRoute', 'firebase.auth', 'myApp.config'])
+  angular.module('myApp.security', ['ngRoute', 'myApp.config'])
 
     .config(['$routeProvider', function ($routeProvider) {
       // routes which are not in our map are redirected to /home
@@ -30,7 +30,7 @@
         securedRoutes.push(path); // store all secured routes for use with authRequired() below
         route.resolve = route.resolve || {};
         route.resolve.user = ['Auth', function (Auth) {
-          return Auth.$requireAuth();
+          return Auth.$requireSignIn();
         }];
         $routeProvider.when(path, route);
         return this;
@@ -46,7 +46,7 @@
     .run(['$rootScope', '$location', 'Auth', 'loginRedirectPath',
       function ($rootScope, $location, Auth, loginRedirectPath) {
         // watch for login status changes and redirect if appropriate
-        Auth.$onAuth(check);
+        Auth.$onAuthStateChanged(check);
 
         // some of our routes may reject resolve promises with the special {authRequired: true} error
         // this redirects to the login page whenever that is encountered
diff --git a/app/config.js b/app/config.js
index 731fb370..7e2de223 100644
--- a/app/config.js
+++ b/app/config.js
@@ -3,20 +3,20 @@
 // Declare app level module which depends on filters, and services
 angular.module('myApp.config', [])
 
-  // version of this seed app is compatible with angularFire 1.0.0
+  // version of this seed app is compatible with angularFire 2.x.x
   // see tags for other versions: https://github.com/firebase/angularFire-seed/tags
-  .constant('version', '1.0.0')
+  .constant('version', '2.0.0')
 
   // where to redirect users if they need to authenticate (see security.js)
   .constant('loginRedirectPath', '/login')
 
   // your Firebase data URL goes here, no trailing slash
-  .constant('FBURL', 'https://angularfire-seed-dev.firebaseio.com')
+  //.constant('FBURL', 'https://peep3auth.firebaseio.com')
 
   // double check that the app has been configured before running it and blowing up space and time
-  .run(['FBURL', '$timeout', function(FBURL, $timeout) {
-    if( FBURL.match('//INSTANCE.firebaseio.com') ) {
-      angular.element(document.body).html('<h1>Please configure app/config.js before running!</h1>');
+  .run(['$timeout', function($timeout) {
+    if( PRIVATE.firebase_databaseURL.match('https://INSTANCE.firebaseio.com') ) {
+      angular.element(document.body).html('<h1>Please configure app/private.js before running!</h1>');
       $timeout(function() {
         angular.element(document.body).removeClass('hide');
       }, 250);
diff --git a/app/home/home.js b/app/home/home.js
index 0cd50cf9..a3290fda 100644
--- a/app/home/home.js
+++ b/app/home/home.js
@@ -1,12 +1,13 @@
 (function(angular) {
   "use strict";
 
-  var app = angular.module('myApp.home', ['firebase.auth', 'firebase', 'firebase.utils', 'ngRoute']);
+  var app = angular.module('myApp.home', ['firebase.appauth', 'firebase', 'ngRoute']);
 
-  app.controller('HomeCtrl', ['$scope', 'fbutil', 'user', '$firebaseObject', 'FBURL', function ($scope, fbutil, user, $firebaseObject, FBURL) {
-    $scope.syncedValue = $firebaseObject(fbutil.ref('syncedValue'));
-    $scope.user = user;
-    $scope.FBURL = FBURL;
+  app.controller('HomeCtrl', ['$scope', '$firebaseObject', 'Auth', function ($scope, $firebaseObject, Auth) {
+    var ref = firebase.database().ref('syncedValue');
+    $scope.syncedValue = $firebaseObject(ref);
+    $scope.user = Auth.$getAuth();;
+    $scope.FBURL = PRIVATE.firebase_databaseURL;
   }]);
 
   app.config(['$routeProvider', function ($routeProvider) {
@@ -19,7 +20,7 @@
         // in the controller, but this makes things cleaner (controller doesn't need to worry
         // about auth status or timing of accessing data or displaying elements)
         user: ['Auth', function (Auth) {
-          return Auth.$waitForAuth();
+          return Auth.$waitForSignIn();
         }]
       }
     });
diff --git a/app/index.html b/app/index.html
index 1687b4a5..a2e015fd 100644
--- a/app/index.html
+++ b/app/index.html
@@ -6,10 +6,10 @@
   <title>My AngularJS App</title>
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" href="bower_components/html5-boilerplate/css/normalize.css">
-  <link rel="stylesheet" href="bower_components/html5-boilerplate/css/main.css">
+  <link rel="stylesheet" href="bower_components/html5-boilerplate/dist/css/normalize.css">
+  <link rel="stylesheet" href="bower_components/html5-boilerplate/dist/css/main.css">
   <link rel="stylesheet" href="app.css"/>
-  <script src="bower_components/html5-boilerplate/js/vendor/modernizr-2.6.2.min.js"></script>
+  <script src="bower_components/html5-boilerplate/dist/js/vendor/modernizr-2.8.3.min.js"></script>
 </head>
 <body ng-cloak>
 
@@ -25,25 +25,25 @@
   <div>AngularFire-seed v<span app-version></span></div>
 
   <!-- In production use:
-<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.x/angular.min.js"></script>
-<script src="//cdn.firebase.com/js/client/2.2.x/firebase.js"></script>
-<script src="//cdn.firebase.com/libs/angularfire/1.0.x/angularfire.min.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.4.x/angular.min.js"></script>
+<script src="//cdn.firebase.com/js/client/3.6.x/firebase.js"></script>
+<script src="//cdn.firebase.com/libs/angularfire/2.0.x/angularfire.min.js"></script>
 -->
   <script src="bower_components/angular/angular.js"></script>
   <script src="bower_components/angular-route/angular-route.js"></script>
   <script src="bower_components/firebase/firebase.js"></script>
   <script src="bower_components/angularfire/dist/angularfire.js"></script>
 
-
+  <script src="private.js"></script>
+  
   <script src="app.js"></script>
   <script src="config.js"></script>
 
   <script src="components/appversion/appversion-directive.js"></script>
-  <script src="components/auth/auth.js"></script>
-  <script src="components/firebase.utils/firebase.utils.js"></script>
   <script src="components/ngcloak/ngcloak-decorator.js"></script>
   <script src="components/reverse/reverse-filter.js"></script>
   <script src="components/security/security.js"></script>
+  <script src="components/auth/auth.js"></script>
 
   <script src="home/home.js"></script>
   <script src="account/account.js"></script>
diff --git a/app/login/login.html b/app/login/login.html
index 743e84eb..6bf41dbb 100644
--- a/app/login/login.html
+++ b/app/login/login.html
@@ -4,7 +4,7 @@ <h2>Login Page</h2>
 <form>
     <label>
         <span>email</span>
-        <input type="text" ng-model="email" />
+        <input type="email" ng-model="email" />
     </label>
     <label>
         <span>password</span>
diff --git a/app/login/login.js b/app/login/login.js
index 04f98237..692ed557 100644
--- a/app/login/login.js
+++ b/app/login/login.js
@@ -1,5 +1,5 @@
 "use strict";
-angular.module('myApp.login', ['firebase.utils', 'firebase.auth', 'ngRoute'])
+angular.module('myApp.login', ['firebase.appauth', 'ngRoute'])
 
   .config(['$routeProvider', function($routeProvider) {
     $routeProvider.when('/login', {
@@ -8,7 +8,7 @@ angular.module('myApp.login', ['firebase.utils', 'firebase.auth', 'ngRoute'])
     });
   }])
 
-  .controller('LoginCtrl', ['$scope', 'Auth', '$location', 'fbutil', function($scope, Auth, $location, fbutil) {
+  .controller('LoginCtrl', ['$scope', 'Auth', '$location', function($scope, Auth, $location) {
     $scope.email = null;
     $scope.pass = null;
     $scope.confirm = null;
@@ -16,8 +16,8 @@ angular.module('myApp.login', ['firebase.utils', 'firebase.auth', 'ngRoute'])
 
     $scope.login = function(email, pass) {
       $scope.err = null;
-      Auth.$authWithPassword({ email: email, password: pass }, {rememberMe: true})
-        .then(function(/* user */) {
+      Auth.$signInWithEmailAndPassword(email, pass)
+        .then(function() {
           $location.path('/account');
         }, function(err) {
           $scope.err = errMessage(err);
@@ -30,19 +30,12 @@ angular.module('myApp.login', ['firebase.utils', 'firebase.auth', 'ngRoute'])
         var email = $scope.email;
         var pass = $scope.pass;
         // create user credentials in Firebase auth system
-        Auth.$createUser({email: email, password: pass})
+        Auth.$createUserWithEmailAndPassword(email, pass)
           .then(function() {
             // authenticate so we have permission to write to Firebase
-            return Auth.$authWithPassword({ email: email, password: pass });
+            return Auth.$signInWithEmailAndPassword(email, pass);
           })
-          .then(function(user) {
-            // create a user profile in our data store
-            var ref = fbutil.ref('users', user.uid);
-            return fbutil.handler(function(cb) {
-              ref.set({email: email, name: name||firstPartOfEmail(email)}, cb);
-            });
-          })
-          .then(function(/* user */) {
+          .then(function() {
             // redirect to the account page
             $location.path('/account');
           }, function(err) {
@@ -67,15 +60,4 @@ angular.module('myApp.login', ['firebase.utils', 'firebase.auth', 'ngRoute'])
     function errMessage(err) {
       return angular.isObject(err) && err.code? err.code : err + '';
     }
-
-    function firstPartOfEmail(email) {
-      return ucfirst(email.substr(0, email.indexOf('@'))||'');
-    }
-
-    function ucfirst (str) {
-      // inspired by: http://kevin.vanzonneveld.net
-      str += '';
-      var f = str.charAt(0).toUpperCase();
-      return f + str.substr(1);
-    }
-  }]);
\ No newline at end of file
+  }]);
diff --git a/app/private-dummy.js b/app/private-dummy.js
new file mode 100644
index 00000000..a83a4165
--- /dev/null
+++ b/app/private-dummy.js
@@ -0,0 +1,14 @@
+// private-dummy.js
+// contains iDUMMY API keys . . .
+//
+// Use this as a template for private.js with real keys
+//
+// and assume that ithe real private.js is included in .gitingore
+ var PRIVATE  = {
+	 firebase_api: 'DUMMY-FIREBASE-API-KEY-not-real!!!!!!!!',
+	 firebase_authDomain: 'INSTANCE.firebaseapp.com',
+	 firebase_databaseURL: 'https://INSTANCE.firebaseio.com',
+	 storageBucket: "INSTANCE.appspot.com",
+         messagingSenderId: "000000000000"
+ };
+
diff --git a/bower.json b/bower.json
index 5116ef9d..749ca1b2 100644
--- a/bower.json
+++ b/bower.json
@@ -6,13 +6,12 @@
   "license": "MIT",
   "private": true,
   "dependencies": {
-    "angular": "~1.3.8",
-    "angular-route": "~1.3.8",
-    "angular-loader": "~1.3.8",
-    "angular-mocks": "~1.3.8",
-    "html5-boilerplate": "~4.3.0",
-    "firebase": "2.2.2",
-    "angularfire": "~1.0.0",
-    "mockfirebase": "~0.10.3"
+    "angular": "~1.4.0",
+    "angular-route": "~1.4.0",
+    "angular-loader": "~1.4.0",
+    "angular-mocks": "~1.4.0",
+    "firebase": "3.6.5",
+    "angularfire": "^2.2.0",
+    "html5-boilerplate": "^5.3.0"
   }
 }
diff --git a/database.rules.json b/database.rules.json
new file mode 100644
index 00000000..e3f8d4ea
--- /dev/null
+++ b/database.rules.json
@@ -0,0 +1,39 @@
+{
+  "rules": {
+    ".read": false,
+    ".write": false,
+    "syncedValue": {
+      ".read": true,
+      ".write": true,
+      ".validate": "newData.isString() && newData.val().length <= 100"
+    },
+    "messages": {
+      ".read": true,
+      "$message": {
+        ".write": true,
+        ".validate": "newData.hasChildren(['text'])",
+        "text": {
+          ".validate": "newData.isString() && newData.val().length <= 1000"
+        },
+        "$other": {
+          ".validate": false
+        }
+      }
+    },
+    "users": {
+      "$user": {
+        ".read": "auth.uid === $user",
+        ".write": "auth.uid === $user && (!newData.exists() || newData.hasChildren())",
+        "name": {
+          ".validate": "newData.isString() && newData.val().length <= 2000"
+        },
+        "email": {
+          ".validate": "newData.isString() && newData.val().length <= 2000"
+        },
+        "$other": {
+          ".validate": false
+        }
+      }
+    }
+  }
+}
diff --git a/firebase.json b/firebase.json
index c85a0d85..2e42040d 100644
--- a/firebase.json
+++ b/firebase.json
@@ -1,9 +1,8 @@
 {
-  "firebase": "INSTANCE",
-  "public": "app",
-  "ignore": [
-    "firebase.json",
-    "**/.*",
-    "**/node_modules/**"
-  ]
+  "database": {
+    "rules": "database.rules.json"
+  },
+  "hosting": {
+    "public": "app"
+  }
 }
diff --git a/package.json b/package.json
index baa9841e..d3c880b7 100644
--- a/package.json
+++ b/package.json
@@ -7,12 +7,17 @@
   "private": true,
   "license": "MIT",
   "devDependencies": {
-    "karma": "~0.10",
-    "protractor": "~0.20.1",
-    "http-server": "^0.6.1",
     "bower": "^1.3.1",
+    "http-server": "^0.6.1",
+    "jasmine-core": "^2.3.4",
+    "karma": "~0.12",
+    "karma-chrome-launcher": "^0.1.12",
+    "karma-firefox-launcher": "^0.1.6",
+    "karma-jasmine": "^0.3.5",
+    "karma-junit-reporter": "^0.2.2",
+    "protractor": "^2.1.0",
     "shelljs": "^0.2.6",
-    "karma-junit-reporter": "^0.2.2"
+    "firebase": "3.6.5"
   },
   "scripts": {
     "postinstall": "bower install",