Merge complete.  User functionality added to API