bug[ats_SM0J7]: Fix AtsUsers management

Refactored code so we can better control
ats user management class initialization.

Updated code to use IAtsClient api and request
IAtsUserAdmin instead of using static utility
classes.

Removed user caching from ats.

Change-Id: I3f0aa04c8ea253fc96684dca305bba76636cd0d7

39 files changed, 369 insertions, 279 deletions

diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/IAtsClient.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/IAtsClient.java
index ff0aae4d532..ccb621692c4 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/IAtsClient.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/IAtsClient.java
@@ -56,4 +56,6 @@ public interface IAtsClient extends IAtsConfigProvider, ITeamDefinitionFactory,
    @Override
    IAtsVersionAdmin getAtsVersionService();
 
+   IAtsUserAdmin getUserAdmin();
+
 }
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/IAtsUserAdmin.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/IAtsUserAdmin.java
new file mode 100644
index 00000000000..ba05529ca53
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/IAtsUserAdmin.java
@@ -0,0 +1,46 @@
+/*
+ * Created on Apr 9, 2013
+ *
+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
+ */
+package org.eclipse.osee.ats.core.client;
+
+import java.util.Collection;
+import java.util.List;
+import org.eclipse.osee.ats.api.user.IAtsUser;
+import org.eclipse.osee.framework.core.data.IUserToken;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.skynet.core.User;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+
+public interface IAtsUserAdmin {
+
+   IAtsUser getCurrentUser() throws OseeCoreException;
+
+   Collection<IAtsUser> getUsers() throws OseeCoreException;
+
+   IAtsUser getUserById(String userId) throws OseeCoreException;
+
+   IAtsUser getUserByName(String name) throws OseeCoreException;
+
+   Collection<IAtsUser> getUsersByUserIds(Collection<String> userIds) throws OseeCoreException;
+
+   ////////////////////////////
+
+   IAtsUser getUserFromToken(IUserToken token) throws OseeCoreException;
+
+   User getOseeUser(IAtsUser user) throws OseeCoreException;
+
+   IAtsUser getUserFromOseeUser(User user) throws OseeCoreException;
+
+   User getCurrentOseeUser() throws OseeCoreException;
+
+   Collection<? extends User> toOseeUsers(Collection<? extends IAtsUser> users) throws OseeCoreException;
+
+   Collection<IAtsUser> getUsers(List<? extends Artifact> artifacts) throws OseeCoreException;
+
+   Collection<User> getOseeUsers(Collection<? extends IAtsUser> users) throws OseeCoreException;
+
+   Collection<IAtsUser> getAtsUsers(Collection<User> users) throws OseeCoreException;
+
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionManager.java
index ade38b2d9f9..9e9399babdd 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionManager.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionManager.java
@@ -12,6 +12,7 @@ package org.eclipse.osee.ats.core.client.action;
 
 import java.util.Collection;
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.osee.ats.api.ai.IAtsActionableItem;
@@ -29,7 +30,6 @@ import org.eclipse.osee.ats.core.client.workflow.ChangeType;
 import org.eclipse.osee.ats.core.client.workflow.ChangeTypeUtil;
 import org.eclipse.osee.ats.core.client.workflow.ITeamWorkflowProvider;
 import org.eclipse.osee.ats.core.config.TeamDefinitions;
-import org.eclipse.osee.ats.core.users.AtsUsers;
 import org.eclipse.osee.framework.core.data.IArtifactType;
 import org.eclipse.osee.framework.core.exception.OseeArgumentException;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -73,7 +73,7 @@ public class ActionManager {
 
       // Create team workflow artifacts
       for (IAtsTeamDefinition teamDef : teamDefs) {
-         List<IAtsUser> leads = AtsUsers.toList(teamDef.getLeads(actionableItems));
+         List<IAtsUser> leads = new LinkedList<IAtsUser>(teamDef.getLeads(actionableItems));
          TeamWorkFlowArtifact teamWf =
             createTeamWorkflow(actionArt, teamDef, actionableItems, leads, transaction, createdDate, createdBy,
                newActionListener);
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCore.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCore.java
index 18be0eb4a65..b1a2287b1bb 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCore.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCore.java
@@ -41,7 +41,7 @@ import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.client.workflow.stateitem.AtsStateItemCoreManager;
 import org.eclipse.osee.ats.core.client.workflow.stateitem.IAtsStateItemCore;
 import org.eclipse.osee.ats.core.config.AtsVersionService;
-import org.eclipse.osee.ats.core.users.AtsUsers;
+import org.eclipse.osee.ats.core.users.AtsCoreUsers;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.data.TokenFactory;
 import org.eclipse.osee.framework.core.enums.BranchState;
@@ -659,7 +659,7 @@ public class AtsBranchManagerCore {
       // Create reviews as necessary
       SkynetTransaction transaction =
          TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), "Create Reviews upon Transition");
-      createNecessaryBranchEventReviews(StateEventType.CreateBranch, teamArt, new Date(), AtsUsers.getSystemUser(),
+      createNecessaryBranchEventReviews(StateEventType.CreateBranch, teamArt, new Date(), AtsCoreUsers.SYSTEM_USER,
          transaction);
       transaction.execute();
 
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/AtsClientImpl.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/AtsClientImpl.java
index f8025c1bb8c..e1414805e81 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/AtsClientImpl.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/AtsClientImpl.java
@@ -26,6 +26,7 @@ import org.eclipse.osee.ats.api.version.IAtsVersion;
 import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinitionService;
 import org.eclipse.osee.ats.api.workflow.IAtsWorkItemService;
 import org.eclipse.osee.ats.core.client.IAtsClient;
+import org.eclipse.osee.ats.core.client.IAtsUserAdmin;
 import org.eclipse.osee.ats.core.client.IAtsVersionAdmin;
 import org.eclipse.osee.ats.core.client.IAtsWorkDefinitionAdmin;
 import org.eclipse.osee.ats.core.client.internal.config.ActionableItemFactory;
@@ -43,6 +44,7 @@ import org.eclipse.osee.ats.core.client.internal.store.TeamDefinitionArtifactRea
 import org.eclipse.osee.ats.core.client.internal.store.TeamDefinitionArtifactWriter;
 import org.eclipse.osee.ats.core.client.internal.store.VersionArtifactReader;
 import org.eclipse.osee.ats.core.client.internal.store.VersionArtifactWriter;
+import org.eclipse.osee.ats.core.client.internal.user.AtsUserAdminImpl;
 import org.eclipse.osee.ats.core.client.internal.workdef.AtsWorkDefinitionAdminImpl;
 import org.eclipse.osee.ats.core.client.internal.workdef.AtsWorkDefinitionCache;
 import org.eclipse.osee.ats.core.client.internal.workdef.AtsWorkDefinitionCacheProvider;
@@ -77,6 +79,7 @@ public class AtsClientImpl implements IAtsClient {
    private ITeamDefinitionFactory teamDefFactory;
    private IVersionFactory versionFactory;
    private CacheProvider<AtsWorkDefinitionCache> workDefCacheProvider;
+   private IAtsUserAdmin atsUserAdmin;
 
    public void setAtsWorkDefinitionService(IAtsWorkDefinitionService workDefService) {
       this.workDefService = workDefService;
@@ -111,10 +114,12 @@ public class AtsClientImpl implements IAtsClient {
       teamDefFactory = new TeamDefinitionFactory();
       versionFactory = new VersionFactory(versionService);
 
+      atsUserAdmin = new AtsUserAdminImpl();
+
       readers.put(AtsArtifactTypes.ActionableItem, new ActionableItemArtifactReader(actionableItemFactory,
-         teamDefFactory, versionFactory));
+         teamDefFactory, versionFactory, atsUserAdmin));
       readers.put(AtsArtifactTypes.TeamDefinition, new TeamDefinitionArtifactReader(actionableItemFactory,
-         teamDefFactory, versionFactory, versionService));
+         teamDefFactory, versionFactory, versionService, atsUserAdmin));
       readers.put(AtsArtifactTypes.Version, new VersionArtifactReader(actionableItemFactory, teamDefFactory,
          versionFactory, versionService));
 
@@ -146,6 +151,8 @@ public class AtsClientImpl implements IAtsClient {
       actionableItemFactory = null;
       teamDefFactory = null;
       versionFactory = null;
+
+      atsUserAdmin = null;
    }
 
    @Override
@@ -262,6 +269,11 @@ public class AtsClientImpl implements IAtsClient {
    }
 
    @Override
+   public IAtsUserAdmin getUserAdmin() {
+      return atsUserAdmin;
+   }
+
+   @Override
    public IAtsQuery createQuery(Collection<? extends IAtsWorkItem> workItems) {
       return new AtsQuery(workItems, workItemService, workItemArtifactProvider);
    }
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/config/LoadAtsConfigCacheCallable.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/config/LoadAtsConfigCacheCallable.java
index aee3c08f0d5..e792af68300 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/config/LoadAtsConfigCacheCallable.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/config/LoadAtsConfigCacheCallable.java
@@ -18,7 +18,6 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
 import org.eclipse.osee.ats.api.team.IAtsTeamDefinition;
 import org.eclipse.osee.ats.api.version.IAtsVersion;
 import org.eclipse.osee.ats.core.client.internal.IAtsArtifactStore;
-import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
 import org.eclipse.osee.framework.core.data.IArtifactType;
 import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
@@ -40,8 +39,6 @@ public class LoadAtsConfigCacheCallable implements Callable<AtsArtifactConfigCac
 
    @Override
    public AtsArtifactConfigCache call() throws Exception {
-      AtsUsersClient.start();
-
       AtsArtifactConfigCache cache = new AtsArtifactConfigCache();
 
       List<IArtifactType> typesToLoad = getTypesToLoad();
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/ActionableItemArtifactReader.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/ActionableItemArtifactReader.java
index ba8c58fff7d..ae18ca77055 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/ActionableItemArtifactReader.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/ActionableItemArtifactReader.java
@@ -17,8 +17,8 @@ import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
 import org.eclipse.osee.ats.api.data.AtsRelationTypes;
 import org.eclipse.osee.ats.api.team.IAtsTeamDefinition;
 import org.eclipse.osee.ats.api.user.IAtsUser;
+import org.eclipse.osee.ats.core.client.IAtsUserAdmin;
 import org.eclipse.osee.ats.core.client.internal.config.AtsArtifactConfigCache;
-import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.config.IActionableItemFactory;
 import org.eclipse.osee.ats.core.config.ITeamDefinitionFactory;
 import org.eclipse.osee.ats.core.config.IVersionFactory;
@@ -32,8 +32,11 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
  */
 public class ActionableItemArtifactReader extends AbstractAtsArtifactReader<IAtsActionableItem> {
 
-   public ActionableItemArtifactReader(IActionableItemFactory actionableItemFactory, ITeamDefinitionFactory teamDefFactory, IVersionFactory versionFactory) {
+   private final IAtsUserAdmin userAdmin;
+
+   public ActionableItemArtifactReader(IActionableItemFactory actionableItemFactory, ITeamDefinitionFactory teamDefFactory, IVersionFactory versionFactory, IAtsUserAdmin userAdmin) {
       super(actionableItemFactory, teamDefFactory, versionFactory);
+      this.userAdmin = userAdmin;
    }
 
    @Override
@@ -63,11 +66,11 @@ public class ActionableItemArtifactReader extends AbstractAtsArtifactReader<IAts
          parentAi.getChildrenActionableItems().add(aia);
       }
       for (Artifact userArt : aiArt.getRelatedArtifacts(AtsRelationTypes.SubscribedUser_User)) {
-         IAtsUser user = AtsUsersClient.getUserFromOseeUser((User) userArt);
+         IAtsUser user = userAdmin.getUserFromOseeUser((User) userArt);
          aia.getSubscribed().add(user);
       }
       for (Artifact userArt : aiArt.getRelatedArtifacts(AtsRelationTypes.ActionableItemLead_Lead)) {
-         IAtsUser user = AtsUsersClient.getUserFromOseeUser((User) userArt);
+         IAtsUser user = userAdmin.getUserFromOseeUser((User) userArt);
          aia.getLeads().add(user);
       }
       for (Artifact childAiArt : aiArt.getChildren()) {
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/TeamDefinitionArtifactReader.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/TeamDefinitionArtifactReader.java
index 1cf42961d90..95e78422edf 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/TeamDefinitionArtifactReader.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/TeamDefinitionArtifactReader.java
@@ -18,8 +18,8 @@ import org.eclipse.osee.ats.api.team.IAtsTeamDefinition;
 import org.eclipse.osee.ats.api.user.IAtsUser;
 import org.eclipse.osee.ats.api.version.IAtsVersion;
 import org.eclipse.osee.ats.api.version.IAtsVersionService;
+import org.eclipse.osee.ats.core.client.IAtsUserAdmin;
 import org.eclipse.osee.ats.core.client.internal.config.AtsArtifactConfigCache;
-import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.config.IActionableItemFactory;
 import org.eclipse.osee.ats.core.config.ITeamDefinitionFactory;
 import org.eclipse.osee.ats.core.config.IVersionFactory;
@@ -35,10 +35,12 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 public class TeamDefinitionArtifactReader extends AbstractAtsArtifactReader<IAtsTeamDefinition> {
 
    private final IAtsVersionService versionService;
+   private final IAtsUserAdmin userAdmin;
 
-   public TeamDefinitionArtifactReader(IActionableItemFactory actionableItemFactory, ITeamDefinitionFactory teamDefFactory, IVersionFactory versionFactory, IAtsVersionService versionService) {
+   public TeamDefinitionArtifactReader(IActionableItemFactory actionableItemFactory, ITeamDefinitionFactory teamDefFactory, IVersionFactory versionFactory, IAtsVersionService versionService, IAtsUserAdmin userAdmin) {
       super(actionableItemFactory, teamDefFactory, versionFactory);
       this.versionService = versionService;
+      this.userAdmin = userAdmin;
    }
 
    @Override
@@ -84,19 +86,19 @@ public class TeamDefinitionArtifactReader extends AbstractAtsArtifactReader<IAts
          versionService.setTeamDefinition(version, teamDef);
       }
       for (Artifact userArt : teamDefArt.getRelatedArtifacts(AtsRelationTypes.SubscribedUser_User)) {
-         IAtsUser user = AtsUsersClient.getUserFromOseeUser((User) userArt);
+         IAtsUser user = userAdmin.getUserFromOseeUser((User) userArt);
          teamDef.getSubscribed().add(user);
       }
       for (Artifact userArt : teamDefArt.getRelatedArtifacts(AtsRelationTypes.TeamLead_Lead)) {
-         IAtsUser user = AtsUsersClient.getUserFromOseeUser((User) userArt);
+         IAtsUser user = userAdmin.getUserFromOseeUser((User) userArt);
          teamDef.getLeads().add(user);
       }
       for (Artifact userArt : teamDefArt.getRelatedArtifacts(AtsRelationTypes.TeamMember_Member)) {
-         IAtsUser user = AtsUsersClient.getUserFromOseeUser((User) userArt);
+         IAtsUser user = userAdmin.getUserFromOseeUser((User) userArt);
          teamDef.getMembers().add(user);
       }
       for (Artifact userArt : teamDefArt.getRelatedArtifacts(AtsRelationTypes.PrivilegedMember_Member)) {
-         IAtsUser user = AtsUsersClient.getUserFromOseeUser((User) userArt);
+         IAtsUser user = userAdmin.getUserFromOseeUser((User) userArt);
          teamDef.getPrivilegedMembers().add(user);
       }
       for (String ruleStr : teamDefArt.getAttributesToStringList(AtsAttributeTypes.RuleDefinition)) {
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUser.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/user/AtsUser.java
index 5eac89329fe..8138efb7e52 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUser.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/user/AtsUser.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.core.client.util;
+package org.eclipse.osee.ats.core.client.internal.user;
 
 import org.eclipse.osee.ats.api.user.IAtsUser;
 import org.eclipse.osee.framework.core.data.Identity;
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/user/AtsUserAdminImpl.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/user/AtsUserAdminImpl.java
new file mode 100644
index 00000000000..de02d420135
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/user/AtsUserAdminImpl.java
@@ -0,0 +1,138 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.ats.core.client.internal.user;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import org.eclipse.osee.ats.api.user.IAtsUser;
+import org.eclipse.osee.ats.core.client.IAtsUserAdmin;
+import org.eclipse.osee.ats.core.users.AtsCoreUsers;
+import org.eclipse.osee.framework.core.data.IUserToken;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.skynet.core.User;
+import org.eclipse.osee.framework.skynet.core.UserManager;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class AtsUserAdminImpl implements IAtsUserAdmin {
+
+   @Override
+   public Collection<IAtsUser> getUsers() throws OseeCoreException {
+      List<User> users = UserManager.getUsers();
+      return getAtsUsers(users);
+   }
+
+   @Override
+   public IAtsUser getUserById(String userId) throws OseeCoreException {
+      IAtsUser atsUser = null;
+      if (userId != null) {
+         atsUser = AtsCoreUsers.getAtsCoreUserByUserId(userId);
+         if (atsUser == null) {
+            User user = UserManager.getUserByUserId(userId);
+            atsUser = new AtsUser(user);
+         }
+      }
+      return atsUser;
+   }
+
+   @Override
+   public Collection<IAtsUser> getUsersByUserIds(Collection<String> userIds) throws OseeCoreException {
+      List<IAtsUser> users = new LinkedList<IAtsUser>();
+      for (String userId : userIds) {
+         IAtsUser user = getUserById(userId);
+         if (user != null) {
+            users.add(user);
+         }
+      }
+      return users;
+   }
+
+   @Override
+   public IAtsUser getCurrentUser() throws OseeCoreException {
+      return getUserById(getCurrentOseeUser().getUserId());
+   }
+
+   @Override
+   public IAtsUser getUserByName(String name) throws OseeCoreException {
+      return getUserFromOseeUser(UserManager.getUserByName(name));
+   }
+
+   @Override
+   public IAtsUser getUserFromToken(IUserToken token) throws OseeCoreException {
+      return getUserById(token.getUserId());
+   }
+
+   @Override
+   public User getOseeUser(IAtsUser user) throws OseeCoreException {
+      return UserManager.getUserByUserId(user.getUserId());
+   }
+
+   @Override
+   public IAtsUser getUserFromOseeUser(User user) throws OseeCoreException {
+      IAtsUser atsUser = null;
+      if (user != null) {
+         atsUser = getUserById(user.getUserId());
+      }
+      return atsUser;
+   }
+
+   @Override
+   public User getCurrentOseeUser() throws OseeCoreException {
+      return UserManager.getUser();
+   }
+
+   @Override
+   public Collection<? extends User> toOseeUsers(Collection<? extends IAtsUser> users) throws OseeCoreException {
+      List<User> results = new LinkedList<User>();
+      for (IAtsUser user : users) {
+         results.add(getOseeUser(user));
+      }
+      return results;
+   }
+
+   @Override
+   public Collection<IAtsUser> getUsers(List<? extends Artifact> artifacts) throws OseeCoreException {
+      List<IAtsUser> users = new LinkedList<IAtsUser>();
+      for (Artifact artifact : artifacts) {
+         if (artifact instanceof User) {
+            User user = (User) artifact;
+            IAtsUser atsUser = getUserFromOseeUser(user);
+            users.add(atsUser);
+         }
+      }
+      return users;
+   }
+
+   @Override
+   public Collection<User> getOseeUsers(Collection<? extends IAtsUser> users) throws OseeCoreException {
+      List<User> results = new LinkedList<User>();
+      for (IAtsUser user : users) {
+         results.add(getOseeUser(user));
+      }
+      return results;
+   }
+
+   @Override
+   public Collection<IAtsUser> getAtsUsers(Collection<User> users) throws OseeCoreException {
+      List<IAtsUser> results = new LinkedList<IAtsUser>();
+      for (User user : users) {
+         IAtsUser userByUserId = getUserById(user.getUserId());
+         if (userByUserId != null) {
+            results.add(userByUserId);
+         }
+      }
+      return results;
+   }
+
+}
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/UsersByIds.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/user/UsersByIds.java
index a64129feb29..662c53c4e94 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/UsersByIds.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/user/UsersByIds.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.core.client.util;
+package org.eclipse.osee.ats.core.client.internal.user;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/workdef/WorkDefUserResolver.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/workdef/WorkDefUserResolver.java
index d0a684e4522..7393523d16f 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/workdef/WorkDefUserResolver.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/workdef/WorkDefUserResolver.java
@@ -28,35 +28,37 @@ public class WorkDefUserResolver implements IUserResolver {
 
    @Override
    public boolean isUserIdValid(String userId) {
+      boolean result = false;
       try {
-         return UserManager.getUserByUserId(userId) != null;
+         result = UserManager.getUserByUserId(userId) != null;
       } catch (OseeCoreException ex) {
-         OseeLog.log(Activator.class, Level.SEVERE, ex);
+         // Do nothing
       }
-      return false;
+      return result;
    }
 
    @Override
    public boolean isUserNameValid(String name) {
+      boolean result = false;
       try {
-         return UserManager.getUserByName(name) != null;
+         result = UserManager.getUserByName(name) != null;
       } catch (OseeCoreException ex) {
-         OseeLog.log(Activator.class, Level.SEVERE, ex);
+         // Do Nothing
       }
-      return false;
+      return result;
    }
 
    @Override
    public String getUserIdByName(String name) {
+      String userId = null;
       try {
          User user = UserManager.getUserByName(name);
          if (user != null) {
-            return user.getUserId();
+            userId = user.getUserId();
          }
       } catch (OseeCoreException ex) {
          OseeLog.log(Activator.class, Level.SEVERE, ex);
       }
-      return null;
+      return userId;
    }
-
 }
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManager.java
index 3eccedb77ba..e935e9a5f11 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManager.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManager.java
@@ -20,8 +20,8 @@ import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
 import org.eclipse.osee.ats.api.team.IAtsTeamDefinition;
 import org.eclipse.osee.ats.api.user.IAtsUser;
 import org.eclipse.osee.ats.core.client.internal.Activator;
+import org.eclipse.osee.ats.core.client.internal.AtsClientService;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -71,7 +71,7 @@ public class AtsNotificationManager {
             notificationAdded = true;
             getNotificationManager().addNotificationEvent(
                new OseeNotificationEvent(
-                  AtsUsersClient.getOseeUsers(subscribedUsers),
+                  AtsClientService.get().getUserAdmin().getOseeUsers(subscribedUsers),
                   getIdString(teamArt),
                   "Workflow Creation",
                   "You have subscribed for email notification for Team \"" + teamArt.getTeamName() + "\"; New Team Workflow created with title \"" + teamArt.getName() + "\""));
@@ -84,7 +84,7 @@ public class AtsNotificationManager {
                notificationAdded = true;
                getNotificationManager().addNotificationEvent(
                   new OseeNotificationEvent(
-                     AtsUsersClient.getOseeUsers(subscribedUsers),
+                     AtsClientService.get().getUserAdmin().getOseeUsers(subscribedUsers),
                      getIdString(teamArt),
                      "Workflow Creation",
                      "You have subscribed for email notification for Actionable Item \"" + teamArt.getTeamName() + "\"; New Team Workflow created with title \"" + teamArt.getName() + "\""));
@@ -138,12 +138,12 @@ public class AtsNotificationManager {
    public static List<EmailGroup> getEmailableGroups(AbstractWorkflowArtifact workflow) throws OseeCoreException {
       ArrayList<EmailGroup> groupNames = new ArrayList<EmailGroup>();
       ArrayList<String> emails = new ArrayList<String>();
-      emails.add(UserManager.getEmail(AtsUsersClient.getOseeUser(workflow.getCreatedBy())));
+      emails.add(UserManager.getEmail(AtsClientService.get().getUserAdmin().getOseeUser(workflow.getCreatedBy())));
       groupNames.add(new EmailGroup("Originator", emails));
       if (workflow.getStateMgr().getAssignees().size() > 0) {
          emails = new ArrayList<String>();
          for (IAtsUser u : workflow.getStateMgr().getAssignees()) {
-            emails.add(UserManager.getEmail(AtsUsersClient.getOseeUser(u)));
+            emails.add(UserManager.getEmail(AtsClientService.get().getUserAdmin().getOseeUser(u)));
          }
          groupNames.add(new EmailGroup("Assignees", emails));
       }
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotifyUsers.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotifyUsers.java
index 61fc101d44a..6b42e63b6a8 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotifyUsers.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotifyUsers.java
@@ -18,14 +18,15 @@ import java.util.List;
 import java.util.logging.Level;
 import org.eclipse.osee.ats.api.user.IAtsUser;
 import org.eclipse.osee.ats.core.client.internal.Activator;
+import org.eclipse.osee.ats.core.client.internal.AtsClientService;
 import org.eclipse.osee.ats.core.client.review.AbstractReviewArtifact;
 import org.eclipse.osee.ats.core.client.review.role.Role;
 import org.eclipse.osee.ats.core.client.review.role.UserRole;
 import org.eclipse.osee.ats.core.client.review.role.UserRoleManager;
-import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.util.SubscribeManager;
 import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
-import org.eclipse.osee.ats.core.users.AtsUsers;
+import org.eclipse.osee.ats.core.users.AtsCoreUsers;
+import org.eclipse.osee.ats.core.users.AtsUsersUtility;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.Collections;
 import org.eclipse.osee.framework.jdk.core.util.DateUtil;
@@ -48,13 +49,13 @@ public class AtsNotifyUsers {
       if (types.contains(AtsNotifyType.Originator)) {
          IAtsUser originator = awa.getCreatedBy();
          if (originator.isActive()) {
-            if (!EmailUtil.isEmailValid(originator.getEmail()) && !AtsUsers.isGuestUser(originator) && !AtsUsers.isSystemUser(originator) && !AtsUsers.isUnAssignedUser(originator)) {
+            if (!EmailUtil.isEmailValid(originator.getEmail()) && !AtsCoreUsers.isAtsCoreUser(originator)) {
                OseeLog.logf(Activator.class, Level.INFO, "Email [%s] invalid for user [%s]", originator.getEmail(),
                   originator.getName());
-            } else if (!AtsUsersClient.getUser().equals(originator)) {
+            } else if (!AtsClientService.get().getUserAdmin().getCurrentUser().equals(originator)) {
                oseeNotificationManager.addNotificationEvent(new OseeNotificationEvent(
-                  Arrays.asList(AtsUsersClient.getOseeUser(originator)), AtsNotificationManager.getIdString(awa),
-                  AtsNotifyType.Originator.name(), String.format(
+                  Arrays.asList(AtsClientService.get().getUserAdmin().getOseeUser(originator)),
+                  AtsNotificationManager.getIdString(awa), AtsNotifyType.Originator.name(), String.format(
                      "You have been set as the originator of [%s] state [%s] titled [%s]", awa.getArtifactTypeName(),
                      awa.getStateMgr().getCurrentStateName(), awa.getName())));
             }
@@ -67,13 +68,13 @@ public class AtsNotifyUsers {
          } else {
             assignees.addAll(awa.getStateMgr().getAssignees());
          }
-         assignees.remove(AtsUsersClient.getUser());
-         assignees = AtsUsers.getValidEmailUsers(assignees);
-         assignees = AtsUsers.getActiveEmailUsers(assignees);
+         assignees.remove(AtsClientService.get().getUserAdmin().getCurrentUser());
+         assignees = AtsUsersUtility.getValidEmailUsers(assignees);
+         assignees = AtsUsersUtility.getActiveEmailUsers(assignees);
          if (assignees.size() > 0) {
             oseeNotificationManager.addNotificationEvent(new OseeNotificationEvent(
-               AtsUsersClient.getOseeUsers(assignees), AtsNotificationManager.getIdString(awa),
-               AtsNotifyType.Assigned.name(), String.format(
+               AtsClientService.get().getUserAdmin().getOseeUsers(assignees),
+               AtsNotificationManager.getIdString(awa), AtsNotifyType.Assigned.name(), String.format(
                   "You have been set as the assignee of [%s] in state [%s] titled [%s]", awa.getArtifactTypeName(),
                   awa.getStateMgr().getCurrentStateName(), awa.getName())));
          }
@@ -81,12 +82,12 @@ public class AtsNotifyUsers {
       if (types.contains(AtsNotifyType.Subscribed)) {
          Collection<IAtsUser> subscribed = new HashSet<IAtsUser>();
          subscribed.addAll(SubscribeManager.getSubscribed(awa));
-         subscribed = AtsUsers.getValidEmailUsers(subscribed);
-         subscribed = AtsUsers.getActiveEmailUsers(subscribed);
+         subscribed = AtsUsersUtility.getValidEmailUsers(subscribed);
+         subscribed = AtsUsersUtility.getActiveEmailUsers(subscribed);
          if (subscribed.size() > 0) {
             oseeNotificationManager.addNotificationEvent(new OseeNotificationEvent(
-               AtsUsersClient.getOseeUsers(subscribed), AtsNotificationManager.getIdString(awa),
-               AtsNotifyType.Subscribed.name(), String.format(
+               AtsClientService.get().getUserAdmin().getOseeUsers(subscribed),
+               AtsNotificationManager.getIdString(awa), AtsNotifyType.Subscribed.name(), String.format(
                   "[%s] titled [%s] transitioned to [%s] and you subscribed for notification.",
                   awa.getArtifactTypeName(), awa.getName(), awa.getStateMgr().getCurrentStateName())));
          }
@@ -97,17 +98,18 @@ public class AtsNotifyUsers {
             if (!EmailUtil.isEmailValid(originator.getEmail())) {
                OseeLog.logf(Activator.class, Level.INFO, "Email [%s] invalid for user [%s]", originator.getEmail(),
                   originator.getName());
-            } else if (!AtsUsersClient.getUser().equals(originator)) {
+            } else if (!AtsClientService.get().getUserAdmin().getCurrentUser().equals(originator)) {
                if (awa.isCompleted()) {
                   oseeNotificationManager.addNotificationEvent(new OseeNotificationEvent(
-                     Arrays.asList(AtsUsersClient.getOseeUser(originator)), AtsNotificationManager.getIdString(awa),
-                     awa.getCurrentStateName(), String.format("[%s] titled [%s] is [%s]", awa.getArtifactTypeName(),
-                        awa.getName(), awa.getCurrentStateName())));
+                     Arrays.asList(AtsClientService.get().getUserAdmin().getOseeUser(originator)),
+                     AtsNotificationManager.getIdString(awa), awa.getCurrentStateName(),
+                     String.format("[%s] titled [%s] is [%s]", awa.getArtifactTypeName(), awa.getName(),
+                        awa.getCurrentStateName())));
                }
                if (awa.isCancelled()) {
                   oseeNotificationManager.addNotificationEvent(new OseeNotificationEvent(
-                     Arrays.asList(AtsUsersClient.getOseeUser(originator)), AtsNotificationManager.getIdString(awa),
-                     awa.getCurrentStateName(), String.format(
+                     Arrays.asList(AtsClientService.get().getUserAdmin().getOseeUser(originator)),
+                     AtsNotificationManager.getIdString(awa), awa.getCurrentStateName(), String.format(
                         "[%s] titled [%s] was [%s] from the [%s] state on [%s].<br>Reason: [%s]",
                         awa.getArtifactTypeName(), awa.getName(), awa.getCurrentStateName(),
                         awa.getCancelledFromState(), DateUtil.getMMDDYYHHMM(awa.internalGetCancelledDate()),
@@ -124,12 +126,12 @@ public class AtsNotifyUsers {
                authorModerator.add(role.getUser());
             }
          }
-         authorModerator = AtsUsers.getValidEmailUsers(authorModerator);
-         authorModerator = AtsUsers.getActiveEmailUsers(authorModerator);
+         authorModerator = AtsUsersUtility.getValidEmailUsers(authorModerator);
+         authorModerator = AtsUsersUtility.getActiveEmailUsers(authorModerator);
          if (authorModerator.size() > 0) {
             oseeNotificationManager.addNotificationEvent(new OseeNotificationEvent(
-               AtsUsersClient.getOseeUsers(authorModerator), AtsNotificationManager.getIdString(awa),
-               AtsNotifyType.Peer_Reviewers_Completed.name(), String.format(
+               AtsClientService.get().getUserAdmin().getOseeUsers(authorModerator),
+               AtsNotificationManager.getIdString(awa), AtsNotifyType.Peer_Reviewers_Completed.name(), String.format(
                   "You are Author/Moderator of [%s] titled [%s] which has been reviewed by all reviewers",
                   awa.getArtifactTypeName(), awa.getName())));
          }
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionOption.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionOption.java
index 03d0aaca880..612bf603e58 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionOption.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionOption.java
@@ -17,7 +17,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.osee.ats.api.user.IAtsUser;
 import org.eclipse.osee.ats.core.client.internal.Activator;
-import org.eclipse.osee.ats.core.users.AtsUsers;
+import org.eclipse.osee.ats.core.client.internal.AtsClientService;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.util.Result;
 import org.eclipse.osee.framework.logging.OseeLog;
@@ -152,7 +152,7 @@ public class DecisionOption {
          m = Pattern.compile("<(.*?)>").matcher(m.group(3));
          while (m.find()) {
             try {
-               assignees.add(AtsUsers.getUser(m.group(1)));
+               assignees.add(AtsClientService.get().getUserAdmin().getUserById(m.group(1)));
             } catch (Exception ex) {
                OseeLog.log(Activator.class, Level.SEVERE, ex);
             }
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionReviewDefinitionManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionReviewDefinitionManager.java
index 1e49724a5ee..66a332a423c 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionReviewDefinitionManager.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionReviewDefinitionManager.java
@@ -18,12 +18,12 @@ import org.eclipse.osee.ats.api.user.IAtsUser;
 import org.eclipse.osee.ats.api.workdef.IAtsDecisionReviewDefinition;
 import org.eclipse.osee.ats.api.workdef.IStateToken;
 import org.eclipse.osee.ats.api.workdef.StateEventType;
+import org.eclipse.osee.ats.core.client.internal.AtsClientService;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
 import org.eclipse.osee.ats.core.client.workflow.log.LogType;
 import org.eclipse.osee.ats.core.client.workflow.transition.TransitionAdapter;
-import org.eclipse.osee.ats.core.users.AtsUsers;
+import org.eclipse.osee.ats.core.users.AtsCoreUsers;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.exception.OseeStateException;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
@@ -47,9 +47,9 @@ public class DecisionReviewDefinitionManager extends TransitionAdapter {
       }
       // Add current user if no valid users specified
       List<IAtsUser> users = new LinkedList<IAtsUser>();
-      users.addAll(AtsUsers.getUsersByUserIds(revDef.getAssignees()));
+      users.addAll(AtsClientService.get().getUserAdmin().getUsersByUserIds(revDef.getAssignees()));
       if (users.isEmpty()) {
-         users.add(AtsUsersClient.getUser());
+         users.add(AtsClientService.get().getUserAdmin().getCurrentUser());
       }
       if (!Strings.isValid(revDef.getReviewTitle())) {
          throw new OseeStateException("ReviewDefinition must specify title for Team Workflow [%s] WorkDefinition [%s]",
@@ -81,7 +81,7 @@ public class DecisionReviewDefinitionManager extends TransitionAdapter {
          return;
       }
       Date createdDate = new Date();
-      IAtsUser createdBy = AtsUsers.getSystemUser();
+      IAtsUser createdBy = AtsCoreUsers.SYSTEM_USER;
       TeamWorkFlowArtifact teamArt = (TeamWorkFlowArtifact) sma;
 
       for (IAtsDecisionReviewDefinition decRevDef : teamArt.getStateDefinition().getDecisionReviews()) {
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionReviewManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionReviewManager.java
index f3debe81c9d..2daf56b8be3 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionReviewManager.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionReviewManager.java
@@ -24,8 +24,8 @@ import org.eclipse.osee.ats.api.workdef.IAtsDecisionReviewOption;
 import org.eclipse.osee.ats.api.workdef.IStateToken;
 import org.eclipse.osee.ats.api.workdef.ReviewBlockType;
 import org.eclipse.osee.ats.api.workdef.StateType;
+import org.eclipse.osee.ats.core.client.internal.AtsClientService;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.client.workflow.transition.TransitionHelper;
 import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager;
@@ -159,7 +159,7 @@ public class DecisionReviewManager {
 
    public static List<IAtsDecisionReviewOption> getDefaultDecisionReviewOptions() throws OseeCoreException {
       List<IAtsDecisionReviewOption> options = new ArrayList<IAtsDecisionReviewOption>();
-      options.add(new SimpleDecisionReviewOption("Yes", true, Arrays.asList(AtsUsersClient.getUser().getUserId())));
+      options.add(new SimpleDecisionReviewOption("Yes", true, Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser().getUserId())));
       options.add(new SimpleDecisionReviewOption("No", false, null));
       return options;
    }
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/PeerReviewDefinitionManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/PeerReviewDefinitionManager.java
index 39bb016bd49..d4dd7c3926c 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/PeerReviewDefinitionManager.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/PeerReviewDefinitionManager.java
@@ -18,11 +18,12 @@ import org.eclipse.osee.ats.api.workdef.IAtsPeerReviewDefinition;
 import org.eclipse.osee.ats.api.workdef.IStateToken;
 import org.eclipse.osee.ats.api.workdef.ReviewBlockType;
 import org.eclipse.osee.ats.api.workdef.StateEventType;
+import org.eclipse.osee.ats.core.client.internal.AtsClientService;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
 import org.eclipse.osee.ats.core.client.workflow.log.LogType;
 import org.eclipse.osee.ats.core.client.workflow.transition.TransitionAdapter;
-import org.eclipse.osee.ats.core.users.AtsUsers;
+import org.eclipse.osee.ats.core.users.AtsCoreUsers;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
@@ -60,7 +61,7 @@ public class PeerReviewDefinitionManager extends TransitionAdapter {
       if (Strings.isValid(peerRevDef.getLocation())) {
          peerArt.setSoleAttributeFromString(AtsAttributeTypes.Location, peerRevDef.getLocation());
       }
-      Collection<IAtsUser> assignees = AtsUsers.getUsersByUserIds(peerRevDef.getAssignees());
+      Collection<IAtsUser> assignees = AtsClientService.get().getUserAdmin().getUsersByUserIds(peerRevDef.getAssignees());
       if (assignees.size() > 0) {
          peerArt.getStateMgr().setAssignees(assignees);
       }
@@ -78,7 +79,7 @@ public class PeerReviewDefinitionManager extends TransitionAdapter {
          return;
       }
       Date createdDate = new Date();
-      IAtsUser createdBy = AtsUsers.getSystemUser();
+      IAtsUser createdBy = AtsCoreUsers.SYSTEM_USER;
       TeamWorkFlowArtifact teamArt = (TeamWorkFlowArtifact) sma;
 
       for (IAtsPeerReviewDefinition peerRevDef : teamArt.getStateDefinition().getPeerReviews()) {
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/PeerToPeerReviewManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/PeerToPeerReviewManager.java
index dcaf3381bb9..3cd308096ad 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/PeerToPeerReviewManager.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/PeerToPeerReviewManager.java
@@ -29,7 +29,6 @@ import org.eclipse.osee.ats.core.client.review.defect.ReviewDefectManager;
 import org.eclipse.osee.ats.core.client.review.role.UserRole;
 import org.eclipse.osee.ats.core.client.review.role.UserRoleManager;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.client.workflow.transition.TransitionHelper;
 import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager;
@@ -144,13 +143,13 @@ public class PeerToPeerReviewManager {
    }
 
    public static PeerToPeerReviewArtifact createNewPeerToPeerReview(TeamWorkFlowArtifact teamArt, String reviewTitle, String againstState, SkynetTransaction transaction) throws OseeCoreException {
-      return createNewPeerToPeerReview(teamArt, reviewTitle, againstState, new Date(), AtsUsersClient.getUser(),
+      return createNewPeerToPeerReview(teamArt, reviewTitle, againstState, new Date(), AtsClientService.get().getUserAdmin().getCurrentUser(),
          transaction);
    }
 
    public static PeerToPeerReviewArtifact createNewPeerToPeerReview(IAtsWorkDefinition workDefinition, TeamWorkFlowArtifact teamArt, String reviewTitle, String againstState, SkynetTransaction transaction) throws OseeCoreException {
       return createNewPeerToPeerReview(workDefinition, teamArt, reviewTitle, againstState, new Date(),
-         AtsUsersClient.getUser(), transaction);
+         AtsClientService.get().getUserAdmin().getCurrentUser(), transaction);
    }
 
    public static PeerToPeerReviewArtifact createNewPeerToPeerReview(TeamWorkFlowArtifact teamArt, String reviewTitle, String againstState, Date createdDate, IAtsUser createdBy, SkynetTransaction transaction) throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/ValidateReviewManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/ValidateReviewManager.java
index a746af5a55a..034d9f2143a 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/ValidateReviewManager.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/ValidateReviewManager.java
@@ -106,7 +106,7 @@ public class ValidateReviewManager {
 
    public static String getValidateReviewFollowupUsersStr(TeamWorkFlowArtifact teamArt) {
       try {
-         return org.eclipse.osee.ats.core.client.util.UsersByIds.getStorageString(getValidateReviewFollowupUsers(teamArt));
+         return org.eclipse.osee.ats.core.client.internal.user.UsersByIds.getStorageString(getValidateReviewFollowupUsers(teamArt));
       } catch (Exception ex) {
          OseeLog.log(Activator.class, Level.SEVERE, ex);
          return ex.getLocalizedMessage();
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/defect/ReviewDefectItem.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/defect/ReviewDefectItem.java
index 7fa1214bba9..4a496c50afa 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/defect/ReviewDefectItem.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/defect/ReviewDefectItem.java
@@ -16,8 +16,7 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 import org.eclipse.osee.ats.api.user.IAtsUser;
-import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
-import org.eclipse.osee.ats.core.users.AtsUsers;
+import org.eclipse.osee.ats.core.client.internal.AtsClientService;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.AXml;
 import org.eclipse.osee.framework.jdk.core.util.DateUtil;
@@ -55,7 +54,7 @@ public class ReviewDefectItem {
    };
 
    public ReviewDefectItem() throws OseeCoreException {
-      userId = AtsUsersClient.getUser().getUserId();
+      userId = AtsClientService.get().getUserAdmin().getCurrentUser().getUserId();
    }
 
    public ReviewDefectItem(IAtsUser user, Severity severity, Disposition disposition, InjectionActivity injectionActivity, String description, String resolution, String location, Date date) throws OseeCoreException {
@@ -187,15 +186,15 @@ public class ReviewDefectItem {
       return severity + " - " + disposition + " - " + injectionActivity + " - " + userId + " on " + DateUtil.getMMDDYYHHMM(date) + "\n";
    }
 
-   public IAtsUser getUser() {
-      return AtsUsers.getUser(userId);
+   public IAtsUser getUser() throws OseeCoreException {
+      return AtsClientService.get().getUserAdmin().getUserById(userId);
    }
 
    public String getUserId() {
       return userId;
    }
 
-   public String toHTML(String labelFont) {
+   public String toHTML(String labelFont) throws OseeCoreException {
       return "DEFECT (" + severity + "): " + description + " (" + getUser().getName() + ")";
    }
 
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/defect/ReviewDefectManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/defect/ReviewDefectManager.java
index 872cd9ed3c6..05a729e9a30 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/defect/ReviewDefectManager.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/defect/ReviewDefectManager.java
@@ -18,8 +18,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
 import org.eclipse.osee.ats.api.user.IAtsUser;
+import org.eclipse.osee.ats.core.client.internal.AtsClientService;
 import org.eclipse.osee.ats.core.client.review.defect.ReviewDefectItem.Severity;
-import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.validator.ArtifactValueProvider;
 import org.eclipse.osee.ats.core.validator.IValueProvider;
 import org.eclipse.osee.framework.core.data.IAttributeType;
@@ -217,7 +217,7 @@ public class ReviewDefectManager {
          builder.append("<TD>" + item.getSeverity() + "</TD>");
          builder.append("<TD>" + item.getDisposition() + "</TD>");
          builder.append("<TD>" + item.getInjectionActivity() + "</TD>");
-         if (user != null && user.equals(AtsUsersClient.getUser())) {
+         if (user != null && user.equals(AtsClientService.get().getUserAdmin().getCurrentUser())) {
             builder.append("<TD bgcolor=\"#CCCCCC\">" + user.getName() + "</TD>");
          } else {
             builder.append("<TD>NONE</TD>");
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/role/UserRole.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/role/UserRole.java
index ff0ab1ed038..6c5249fb710 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/role/UserRole.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/role/UserRole.java
@@ -14,9 +14,8 @@ import java.text.NumberFormat;
 import java.util.logging.Level;
 import org.eclipse.osee.ats.api.user.IAtsUser;
 import org.eclipse.osee.ats.core.client.internal.Activator;
-import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
+import org.eclipse.osee.ats.core.client.internal.AtsClientService;
 import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
-import org.eclipse.osee.ats.core.users.AtsUsers;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.AXml;
 import org.eclipse.osee.framework.jdk.core.util.GUID;
@@ -36,7 +35,7 @@ public class UserRole {
    private Boolean completed = false;
 
    public UserRole() throws OseeCoreException {
-      this(Role.Reviewer, AtsUsersClient.getUser().getUserId(), null, false);
+      this(Role.Reviewer, AtsClientService.get().getUserAdmin().getCurrentUser().getUserId(), null, false);
    }
 
    public UserRole(Role role, IAtsUser user) throws OseeCoreException {
@@ -125,8 +124,8 @@ public class UserRole {
       this.role = role;
    }
 
-   public IAtsUser getUser() {
-      return AtsUsers.getUser(userId);
+   public IAtsUser getUser() throws OseeCoreException {
+      return AtsClientService.get().getUserAdmin().getUserById(userId);
    }
 
    public void setUser(User user) throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/role/UserRoleManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/role/UserRoleManager.java
index 809b30cce50..73fca6a5541 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/role/UserRoleManager.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/role/UserRoleManager.java
@@ -19,11 +19,11 @@ import java.util.regex.Pattern;
 import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
 import org.eclipse.osee.ats.api.user.IAtsUser;
 import org.eclipse.osee.ats.core.client.internal.Activator;
+import org.eclipse.osee.ats.core.client.internal.AtsClientService;
 import org.eclipse.osee.ats.core.client.notify.AtsNotificationManager;
 import org.eclipse.osee.ats.core.client.notify.AtsNotifyType;
 import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact;
 import org.eclipse.osee.ats.core.client.review.defect.ReviewDefectManager;
-import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.validator.ArtifactValueProvider;
 import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
 import org.eclipse.osee.ats.core.validator.IValueProvider;
@@ -245,8 +245,8 @@ public class UserRoleManager {
                }
             }
          } else {
-            if (!assignees.contains(AtsUsersClient.getUser())) {
-               assignees.add(AtsUsersClient.getUser());
+            if (!assignees.contains(AtsClientService.get().getUserAdmin().getCurrentUser())) {
+               assignees.add(AtsClientService.get().getUserAdmin().getCurrentUser());
             }
          }
       }
@@ -293,6 +293,6 @@ public class UserRoleManager {
       }
       AbstractWorkflowArtifact awa = (AbstractWorkflowArtifact) artifact;
       awa.getStateMgr().setMetrics(awa.getStateDefinition(), hoursSpent,
-         awa.getStateMgr().getPercentComplete(awa.getCurrentStateName()), true, AtsUsersClient.getUser(), new Date());
+         awa.getStateMgr().getPercentComplete(awa.getCurrentStateName()), true, AtsClientService.get().getUserAdmin().getCurrentUser(), new Date());
    }
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/AbstractTaskableArtifact.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/AbstractTaskableArtifact.java
index 8d9a58e58bf..0f7bd710205 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/AbstractTaskableArtifact.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/AbstractTaskableArtifact.java
@@ -26,8 +26,8 @@ import org.eclipse.osee.ats.api.user.IAtsUser;
 import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition;
 import org.eclipse.osee.ats.api.workdef.IStateToken;
 import org.eclipse.osee.ats.core.client.internal.Activator;
+import org.eclipse.osee.ats.core.client.internal.AtsClientService;
 import org.eclipse.osee.ats.core.client.util.AtsTaskCache;
-import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
 import org.eclipse.osee.ats.core.client.workflow.PercentCompleteTotalUtil;
@@ -98,7 +98,7 @@ public abstract class AbstractTaskableArtifact extends AbstractWorkflowArtifact
    }
 
    public TaskArtifact createNewTask(String title, Date createdDate, IAtsUser createdBy) throws OseeCoreException {
-      return createNewTask(Arrays.asList(AtsUsersClient.getUser()), title, createdDate, createdBy);
+      return createNewTask(Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), title, createdDate, createdBy);
    }
 
    public TaskArtifact createNewTask(List<? extends IAtsUser> assignees, String title, Date createdDate, IAtsUser createdBy) throws OseeCoreException {
@@ -108,7 +108,7 @@ public abstract class AbstractTaskableArtifact extends AbstractWorkflowArtifact
 
       addRelation(AtsRelationTypes.TeamWfToTask_Task, taskArt);
       taskArt.initializeNewStateMachine(assignees, new Date(),
-         (createdBy == null ? AtsUsersClient.getUser() : createdBy));
+         (createdBy == null ? AtsClientService.get().getUserAdmin().getCurrentUser() : createdBy));
 
       // Set parent state task is related to
       taskArt.setSoleAttributeValue(AtsAttributeTypes.RelatedToState, getStateMgr().getCurrentStateName());
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/TaskArtifact.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/TaskArtifact.java
index 7e4979daacd..f0dfb34b04a 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/TaskArtifact.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/TaskArtifact.java
@@ -19,9 +19,9 @@ import org.eclipse.osee.ats.api.data.AtsRelationTypes;
 import org.eclipse.osee.ats.api.user.IAtsUser;
 import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition;
 import org.eclipse.osee.ats.api.workflow.IAtsTask;
+import org.eclipse.osee.ats.core.client.internal.AtsClientService;
 import org.eclipse.osee.ats.core.client.team.TeamState;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
 import org.eclipse.osee.ats.core.client.workflow.log.AtsLog;
 import org.eclipse.osee.ats.core.client.workflow.log.LogItem;
@@ -73,7 +73,7 @@ public class TaskArtifact extends AbstractWorkflowArtifact implements IAtsTask,
             return new Result("Transition Error %s", results.toString());
          }
       } else if (fromState.getName().equals(TeamState.Cancelled.getName()) && isCancelled()) {
-         Result result = TaskManager.transitionToInWork(this, AtsUsersClient.getUser(), 99, 0, transaction);
+         Result result = TaskManager.transitionToInWork(this, AtsClientService.get().getUserAdmin().getCurrentUser(), 99, 0, transaction);
          return result;
       }
       return Result.TrueResult;
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/TaskManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/TaskManager.java
index ce49f5af26e..2727a8ae455 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/TaskManager.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/TaskManager.java
@@ -21,7 +21,6 @@ import org.eclipse.osee.ats.core.client.internal.Activator;
 import org.eclipse.osee.ats.core.client.internal.AtsClientService;
 import org.eclipse.osee.ats.core.client.team.TeamState;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.client.workflow.transition.TransitionHelper;
 import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager;
@@ -54,7 +53,7 @@ public class TaskManager {
       // Assign current user if unassigned
       try {
          if (taskArt.getStateMgr().isUnAssigned()) {
-            taskArt.getStateMgr().setAssignee(AtsUsersClient.getUser());
+            taskArt.getStateMgr().setAssignee(AtsClientService.get().getUserAdmin().getCurrentUser());
          }
          taskArt.getStateMgr().updateMetrics(taskArt.getStateDefinition(), additionalHours, 100, true);
          if (estimatedHours > 0.0) {
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/createtasks/CreateTasksOperation.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/createtasks/CreateTasksOperation.java
index ec30c613b67..450ffac2786 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/createtasks/CreateTasksOperation.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/createtasks/CreateTasksOperation.java
@@ -28,10 +28,10 @@ import org.eclipse.osee.ats.api.version.IAtsVersion;
 import org.eclipse.osee.ats.core.client.action.ActionManager;
 import org.eclipse.osee.ats.core.client.config.ActionableItemManager;
 import org.eclipse.osee.ats.core.client.internal.Activator;
+import org.eclipse.osee.ats.core.client.internal.AtsClientService;
 import org.eclipse.osee.ats.core.client.task.TaskArtifact;
 import org.eclipse.osee.ats.core.client.team.CreateTeamOption;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.config.AtsVersionService;
 import org.eclipse.osee.ats.core.config.TeamDefinitions;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -181,7 +181,7 @@ public class CreateTasksOperation extends AbstractOperation {
     */
    private TeamWorkFlowArtifact ensureDestTeamWfExists(TeamWorkFlowArtifact reqTeamWf, IAtsActionableItem actionableItemArt, IAtsVersion destVersion, SkynetTransaction transaction, boolean reportOnly) throws OseeCoreException {
       Date createdDate = new Date();
-      IAtsUser createdBy = AtsUsersClient.getUser();
+      IAtsUser createdBy = AtsClientService.get().getUserAdmin().getCurrentUser();
 
       TeamWorkFlowArtifact destTeamWf = findDestTeamWf(reqTeamWf, actionableItemArt, destVersion);
 
@@ -192,7 +192,7 @@ public class CreateTasksOperation extends AbstractOperation {
 
          destTeamWf =
             ActionManager.createTeamWorkflow(actionArt, teamDef, Collections.singleton(actionableItemArt),
-               Arrays.asList(AtsUsersClient.getUser()), transaction, createdDate, createdBy, null,
+               Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), transaction, createdDate, createdBy, null,
                CreateTeamOption.Duplicate_If_Exists);
          if (destTeamWf != null) {
             AtsVersionService.get().setTargetedVersionAndStore(destTeamWf, destVersion);
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/createtasks/TaskOpCreate.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/createtasks/TaskOpCreate.java
index de66f3eb0d8..651b5383afe 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/createtasks/TaskOpCreate.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/createtasks/TaskOpCreate.java
@@ -16,7 +16,7 @@ import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
 import org.eclipse.osee.ats.core.client.task.TaskArtifact;
 import org.eclipse.osee.ats.core.client.team.TeamState;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.core.users.AtsUsers;
+import org.eclipse.osee.ats.core.users.AtsCoreUsers;
 import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -40,7 +40,8 @@ public class TaskOpCreate extends AbstractTaskOp {
       String taskTitle = taskTitleProvider.getTaskTitle(metadata);
       Date creationDate = new Date();
 
-      TaskArtifact taskArt = parentTeamWf.createNewTask(taskTitle, creationDate, AtsUsers.getSystemUser());
+      TaskArtifact taskArt =
+         parentTeamWf.createNewTask(taskTitle, creationDate, AtsCoreUsers.SYSTEM_USER);
 
       // create for Implement state regardless of which state workflow is in
       taskArt.setSoleAttributeValue(AtsAttributeTypes.RelatedToState, TeamState.Implement.getName());
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUsersClient.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUsersClient.java
deleted file mode 100644
index 4c0f710720e..00000000000
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUsersClient.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.core.client.util;
-
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import org.eclipse.osee.ats.api.user.IAtsUser;
-import org.eclipse.osee.ats.core.users.AtsUsers;
-import org.eclipse.osee.framework.core.data.IUserToken;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.User;
-import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsUsersClient {
-
-   public static IAtsUser currentUser;
-
-   public static void start() throws OseeCoreException {
-      //      ElapsedTime time = new ElapsedTime("Loading ATS Users");
-      AtsUsers.clearCache();
-      for (User user : UserManager.getUsersAll()) {
-         AtsUsers.addUser(getUserFromOseeUser(user));
-      }
-      //      time.end();
-   }
-
-   public static Collection<? extends User> toOseeUsers(Collection<? extends IAtsUser> users) throws OseeCoreException {
-      List<User> results = new LinkedList<User>();
-      for (IAtsUser user : users) {
-         results.add(getOseeUser(user));
-      }
-      return results;
-   }
-
-   public static User getOseeUser(IAtsUser user) throws OseeCoreException {
-      return UserManager.getUserByUserId(user.getUserId());
-   }
-
-   public static IAtsUser getUser(String userId) throws OseeCoreException {
-      if (userId == null) {
-         return null;
-      }
-      IAtsUser atsUser = AtsUsers.getUser(userId);
-      if (atsUser == null) {
-         atsUser = new AtsUser(UserManager.getUserByUserId(userId));
-         AtsUsers.addUser(atsUser);
-      }
-      return atsUser;
-   }
-
-   public static IAtsUser getUserFromOseeUser(User user) throws OseeCoreException {
-      if (user != null) {
-         return getUser(user.getUserId());
-      }
-      return null;
-   }
-
-   public static IAtsUser getUser() throws OseeCoreException {
-      if (currentUser == null) {
-         currentUser = getUserFromOseeUser(UserManager.getUser());
-      }
-      return currentUser;
-   }
-
-   public static IAtsUser getUserFromToken(IUserToken token) throws OseeCoreException {
-      return getUser(token.getUserId());
-   }
-
-   public static Collection<IAtsUser> getUsers(List<? extends Artifact> artifacts) throws OseeCoreException {
-      List<IAtsUser> users = new LinkedList<IAtsUser>();
-      for (Artifact userId : artifacts) {
-         if (userId instanceof User) {
-            users.add(getUserFromOseeUser((User) userId));
-         }
-      }
-      return users;
-   }
-
-   public static Collection<User> getOseeUsers(Collection<? extends IAtsUser> users) throws OseeCoreException {
-      List<User> results = new LinkedList<User>();
-      for (IAtsUser user : users) {
-         results.add(AtsUsersClient.getOseeUser(user));
-      }
-      return results;
-   }
-
-   public static Collection<IAtsUser> getAtsUsers(Collection<User> users) throws OseeCoreException {
-      List<IAtsUser> results = new LinkedList<IAtsUser>();
-      for (User user : users) {
-         IAtsUser userByUserId = AtsUsers.getUser(user.getUserId());
-         if (userByUserId == null) {
-            AtsUsers.addUser(getUserFromOseeUser(user));
-            userByUserId = AtsUsers.getUser(user.getUserId());
-            if (userByUserId == null) {
-               throw new OseeCoreException("Can not access IAtsUser from User [%s]", user.toStringWithId());
-            }
-         }
-         results.add(userByUserId);
-      }
-      return results;
-   }
-
-   public static User getOseeUser() throws OseeCoreException {
-      return getOseeUser(getUser());
-   }
-
-   public static IAtsUser getUserByName(String name) throws OseeCoreException {
-      return getUserFromOseeUser(UserManager.getUserByName(name));
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/SubscribeManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/SubscribeManager.java
index 83b18c925c4..6d62d150817 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/SubscribeManager.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/SubscribeManager.java
@@ -16,6 +16,7 @@ import java.util.Collection;
 import java.util.List;
 import org.eclipse.osee.ats.api.data.AtsRelationTypes;
 import org.eclipse.osee.ats.api.user.IAtsUser;
+import org.eclipse.osee.ats.core.client.internal.AtsClientService;
 import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.User;
@@ -30,13 +31,15 @@ public class SubscribeManager {
 
    public static void addSubscribed(AbstractWorkflowArtifact workflow, IAtsUser user, SkynetTransaction transaction) throws OseeCoreException {
       if (!workflow.getRelatedArtifacts(AtsRelationTypes.SubscribedUser_User).contains(user)) {
-         workflow.addRelation(AtsRelationTypes.SubscribedUser_User, AtsUsersClient.getOseeUser(user));
+         workflow.addRelation(AtsRelationTypes.SubscribedUser_User,
+            AtsClientService.get().getUserAdmin().getOseeUser(user));
          workflow.persist(transaction);
       }
    }
 
    public static void removeSubscribed(AbstractWorkflowArtifact workflow, IAtsUser user, SkynetTransaction transaction) throws OseeCoreException {
-      workflow.deleteRelation(AtsRelationTypes.SubscribedUser_User, AtsUsersClient.getOseeUser(user));
+      workflow.deleteRelation(AtsRelationTypes.SubscribedUser_User,
+         AtsClientService.get().getUserAdmin().getOseeUser(user));
       workflow.persist(transaction);
    }
 
@@ -47,14 +50,14 @@ public class SubscribeManager {
    public static List<IAtsUser> getSubscribed(AbstractWorkflowArtifact workflow) throws OseeCoreException {
       ArrayList<IAtsUser> arts = new ArrayList<IAtsUser>();
       for (Artifact art : workflow.getRelatedArtifacts(AtsRelationTypes.SubscribedUser_User)) {
-         arts.add(AtsUsersClient.getUserFromOseeUser((User) art));
+         arts.add(AtsClientService.get().getUserAdmin().getUserFromOseeUser((User) art));
       }
       return arts;
    }
 
    public static boolean amISubscribed(AbstractWorkflowArtifact workflow) {
       try {
-         return isSubscribed(workflow, AtsUsersClient.getUser());
+         return isSubscribed(workflow, AtsClientService.get().getUserAdmin().getCurrentUser());
       } catch (OseeCoreException ex) {
          return false;
       }
@@ -69,14 +72,15 @@ public class SubscribeManager {
          SkynetTransaction transaction =
             TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), "Toggle Subscribed");
          for (AbstractWorkflowArtifact awa : awas) {
-            SubscribeManager.removeSubscribed(awa, AtsUsersClient.getUser(), transaction);
+            SubscribeManager.removeSubscribed(awa, AtsClientService.get().getUserAdmin().getCurrentUser(),
+               transaction);
          }
          transaction.execute();
       } else {
          SkynetTransaction transaction =
             TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), "Toggle Subscribed");
          for (AbstractWorkflowArtifact awa : awas) {
-            SubscribeManager.addSubscribed(awa, AtsUsersClient.getUser(), transaction);
+            SubscribeManager.addSubscribed(awa, AtsClientService.get().getUserAdmin().getCurrentUser(), transaction);
          }
          transaction.execute();
       }
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/AbstractWorkflowArtifact.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/AbstractWorkflowArtifact.java
index 1e5b33f938f..fbb799b3a1e 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/AbstractWorkflowArtifact.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/AbstractWorkflowArtifact.java
@@ -41,7 +41,6 @@ import org.eclipse.osee.ats.core.client.review.AbstractReviewArtifact;
 import org.eclipse.osee.ats.core.client.review.ReviewManager;
 import org.eclipse.osee.ats.core.client.task.AbstractTaskableArtifact;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.client.workflow.log.ArtifactLog;
 import org.eclipse.osee.ats.core.client.workflow.log.AtsLog;
@@ -50,7 +49,7 @@ import org.eclipse.osee.ats.core.client.workflow.log.LogType;
 import org.eclipse.osee.ats.core.client.workflow.note.ArtifactNote;
 import org.eclipse.osee.ats.core.client.workflow.note.AtsNote;
 import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager;
-import org.eclipse.osee.ats.core.users.AtsUsers;
+import org.eclipse.osee.ats.core.users.AtsCoreUsers;
 import org.eclipse.osee.ats.core.util.AtsObjects;
 import org.eclipse.osee.ats.core.workdef.WorkDefinitionMatch;
 import org.eclipse.osee.framework.access.AccessControlManager;
@@ -109,8 +108,9 @@ public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact imple
    }
 
    private void initializeNewStateMachine(IStateToken state, List<? extends IAtsUser> assignees, Date createdDate, IAtsUser createdBy) throws OseeCoreException {
-      getStateMgr().initializeStateMachine(state, assignees, (createdBy == null ? AtsUsersClient.getUser() : createdBy));
-      IAtsUser user = createdBy == null ? AtsUsersClient.getUser() : createdBy;
+      getStateMgr().initializeStateMachine(state, assignees,
+         (createdBy == null ? AtsClientService.get().getUserAdmin().getCurrentUser() : createdBy));
+      IAtsUser user = createdBy == null ? AtsClientService.get().getUserAdmin().getCurrentUser() : createdBy;
       setCreatedBy(user, true, createdDate);
       TransitionManager.logStateStartedEvent(this, state, createdDate, user);
    }
@@ -428,6 +428,9 @@ public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact imple
 
    public IAtsWorkDefinition getWorkDefinition() {
       WorkDefinitionMatch match = getWorkDefinitionMatch();
+      if (match == null) {
+         return null;
+      }
       if (!match.isMatched()) {
          OseeLog.log(Activator.class, Level.SEVERE, match.toString());
          return null;
@@ -494,7 +497,8 @@ public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact imple
          if (getSoleAttributeValue(AtsAttributeTypes.CreatedBy, null) == null) {
             atsLog.addLog(LogType.Originated, "", "", date, user);
          } else {
-            atsLog.addLog(LogType.Originated, "", "Changed by " + AtsUsersClient.getUser().getName(), date, user);
+            atsLog.addLog(LogType.Originated, "",
+               "Changed by " + AtsClientService.get().getUserAdmin().getCurrentUser().getName(), date, user);
             atsLog.internalResetOriginator(user);
          }
       }
@@ -532,7 +536,7 @@ public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact imple
    public IAtsUser getCreatedBy() throws OseeCoreException {
       String userId = getSoleAttributeValue(AtsAttributeTypes.CreatedBy, null);
       if (Strings.isValid(userId)) {
-         return AtsUsers.getUser(userId);
+         return AtsClientService.get().getUserAdmin().getUserById(userId);
       }
       return null;
    }
@@ -544,7 +548,7 @@ public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact imple
    public IAtsUser getCancelledBy() throws OseeCoreException {
       String userId = getSoleAttributeValue(AtsAttributeTypes.CancelledBy, null);
       if (Strings.isValid(userId)) {
-         return AtsUsers.getUser(userId);
+         return AtsClientService.get().getUserAdmin().getUserById(userId);
       }
       return null;
    }
@@ -572,7 +576,7 @@ public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact imple
    public IAtsUser getCompletedBy() throws OseeCoreException {
       String userId = getSoleAttributeValue(AtsAttributeTypes.CompletedBy, null);
       if (Strings.isValid(userId)) {
-         return AtsUsers.getUser(userId);
+         return AtsClientService.get().getUserAdmin().getUserById(userId);
       }
       return null;
    }
@@ -626,17 +630,17 @@ public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact imple
    }
 
    public void setTransitionAssignees(Collection<IAtsUser> assignees) throws OseeCoreException {
-      if (assignees.contains(AtsUsers.getSystemUser()) || assignees.contains(AtsUsers.getGuestUser())) {
+      if (assignees.contains(AtsCoreUsers.SYSTEM_USER) || assignees.contains(AtsCoreUsers.GUEST_USER)) {
          throw new OseeArgumentException("Can not assign workflow to OseeSystem or Guest");
       }
-      if (assignees.size() > 1 && assignees.contains(AtsUsers.getUnAssigned())) {
+      if (assignees.size() > 1 && assignees.contains(AtsCoreUsers.UNASSIGNED_USER)) {
          throw new OseeArgumentException("Can not assign to user and UnAssigned");
       }
       transitionAssignees = assignees;
    }
 
    public boolean isAssigneeMe() throws OseeCoreException {
-      return stateMgr.getAssignees().contains(AtsUsersClient.getUser());
+      return stateMgr.getAssignees().contains(AtsClientService.get().getUserAdmin().getCurrentUser());
    }
 
    /*
@@ -645,8 +649,8 @@ public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact imple
     */
    public Collection<? extends IAtsUser> getTransitionAssignees() throws OseeCoreException {
       if (transitionAssignees != null) {
-         if (!transitionAssignees.isEmpty() && transitionAssignees.contains(AtsUsers.getUnAssigned())) {
-            transitionAssignees.remove(AtsUsers.getUnAssigned());
+         if (!transitionAssignees.isEmpty() && transitionAssignees.contains(AtsCoreUsers.UNASSIGNED_USER)) {
+            transitionAssignees.remove(AtsCoreUsers.UNASSIGNED_USER);
          }
          if (!transitionAssignees.isEmpty()) {
             return transitionAssignees;
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/AtsWorkStateFactory.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/AtsWorkStateFactory.java
index 132f6831867..15417826c0b 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/AtsWorkStateFactory.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/AtsWorkStateFactory.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.ats.core.client.workflow;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.eclipse.osee.ats.core.client.util.UsersByIds;
+import org.eclipse.osee.ats.core.client.internal.user.UsersByIds;
 import org.eclipse.osee.ats.core.model.impl.WorkStateImpl;
 import org.eclipse.osee.framework.core.exception.OseeArgumentException;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -28,7 +28,7 @@ public class AtsWorkStateFactory {
    public static String toXml(StateManager stateMgr, String stateName) throws OseeCoreException {
       StringBuffer sb = new StringBuffer(stateName);
       sb.append(";");
-      sb.append(org.eclipse.osee.ats.core.client.util.UsersByIds.getStorageString(stateMgr.getAssignees(stateName)));
+      sb.append(org.eclipse.osee.ats.core.client.internal.user.UsersByIds.getStorageString(stateMgr.getAssignees(stateName)));
       sb.append(";");
       double hoursSpent = stateMgr.getHoursSpent(stateName);
       if (hoursSpent > 0) {
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/StateManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/StateManager.java
index eed967ae0f5..1bba958766d 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/StateManager.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/StateManager.java
@@ -36,7 +36,6 @@ import org.eclipse.osee.ats.core.client.notify.AtsNotificationManager;
 import org.eclipse.osee.ats.core.client.notify.AtsNotifyType;
 import org.eclipse.osee.ats.core.client.team.SimpleTeamState;
 import org.eclipse.osee.ats.core.client.team.TeamState;
-import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.client.workflow.log.LogItem;
 import org.eclipse.osee.ats.core.client.workflow.log.LogType;
@@ -44,7 +43,6 @@ import org.eclipse.osee.ats.core.model.WorkStateFactory;
 import org.eclipse.osee.ats.core.model.impl.WorkStateImpl;
 import org.eclipse.osee.ats.core.model.impl.WorkStateProviderImpl;
 import org.eclipse.osee.ats.core.notify.IAtsNotificationListener;
-import org.eclipse.osee.ats.core.users.AtsUsers;
 import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
 import org.eclipse.osee.framework.core.enums.SystemUser;
 import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
@@ -170,7 +168,8 @@ public class StateManager implements IAtsNotificationListener, WorkStateProvider
          awa.setSoleAttributeValue(AtsAttributeTypes.PercentComplete, percentComplete);
       }
       if (logMetrics) {
-         logMetrics(awa.getStateMgr().getCurrentState(), AtsUsersClient.getUser(), new Date());
+         logMetrics(awa.getStateMgr().getCurrentState(), AtsClientService.get().getUserAdmin().getCurrentUser(),
+            new Date());
       }
       writeToArtifact();
    }
@@ -205,7 +204,8 @@ public class StateManager implements IAtsNotificationListener, WorkStateProvider
       boolean changed = setMetricsIfChanged(state, hours, percentComplete);
       if (changed) {
          if (logMetrics) {
-            logMetrics(awa.getStateMgr().getCurrentState(), AtsUsersClient.getUser(), new Date());
+            logMetrics(awa.getStateMgr().getCurrentState(), AtsClientService.get().getUserAdmin().getCurrentUser(),
+               new Date());
          }
          writeToArtifact();
       }
@@ -249,7 +249,7 @@ public class StateManager implements IAtsNotificationListener, WorkStateProvider
    }
 
    public void setAssignees(Collection<? extends IAtsUser> assignees) throws OseeCoreException {
-      setAssignees(getCurrentStateName(), AtsUsers.toList(assignees));
+      setAssignees(getCurrentStateName(), new LinkedList<IAtsUser>(assignees));
    }
 
    /**
@@ -266,7 +266,7 @@ public class StateManager implements IAtsNotificationListener, WorkStateProvider
             throw new OseeStateException("Can't assign completed/cancelled states.");
          }
       }
-      getStateProvider().setAssignees(stateName, AtsUsers.toList(assignees));
+      getStateProvider().setAssignees(stateName, new LinkedList<IAtsUser>(assignees));
       writeToArtifact();
    }
 
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/log/AtsLog.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/log/AtsLog.java
index edfa43d7a5a..690b4579c4e 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/log/AtsLog.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/log/AtsLog.java
@@ -21,7 +21,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.osee.ats.api.user.IAtsUser;
 import org.eclipse.osee.ats.core.client.internal.Activator;
-import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
+import org.eclipse.osee.ats.core.client.internal.AtsClientService;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.AHTML;
 import org.eclipse.osee.framework.jdk.core.util.AXml;
@@ -274,7 +274,7 @@ public class AtsLog {
     * @param state name of state or null
     */
    public void addLog(LogType type, String state, String msg) throws OseeCoreException {
-      addLog(type, state, msg, new Date(), AtsUsersClient.getUser());
+      addLog(type, state, msg, new Date(), AtsClientService.get().getUserAdmin().getCurrentUser());
    }
 
    /**
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/log/LogItem.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/log/LogItem.java
index 2ae97139482..252954372b9 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/log/LogItem.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/log/LogItem.java
@@ -15,7 +15,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 import org.eclipse.osee.ats.api.user.IAtsUser;
-import org.eclipse.osee.ats.core.users.AtsUsers;
+import org.eclipse.osee.ats.core.client.internal.AtsClientService;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.DateUtil;
 
@@ -35,13 +35,13 @@ public class LogItem {
       this(type.name(), String.valueOf(date.getTime()), user.getUserId(), state, msg, hrid);
    }
 
-   public LogItem(LogType type, String date, String userId, String state, String msg, String hrid) {
+   public LogItem(LogType type, String date, String userId, String state, String msg, String hrid) throws OseeCoreException {
       Long dateLong = Long.valueOf(date);
       this.date = new Date(dateLong.longValue());
       this.msg = msg;
       this.state = intern(state);
       this.userId = intern(userId);
-      this.user = AtsUsers.getUser(userId);
+      this.user = AtsClientService.get().getUserAdmin().getUserById(userId);
       this.type = type;
    }
 
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/note/NoteItem.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/note/NoteItem.java
index 90310f9c33c..a1e0bf4db8e 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/note/NoteItem.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/note/NoteItem.java
@@ -17,7 +17,8 @@ import java.util.List;
 import java.util.logging.Level;
 import org.eclipse.osee.ats.api.user.IAtsUser;
 import org.eclipse.osee.ats.core.client.internal.Activator;
-import org.eclipse.osee.ats.core.users.AtsUsers;
+import org.eclipse.osee.ats.core.client.internal.AtsClientService;
+import org.eclipse.osee.ats.core.users.AtsCoreUsers;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.exception.UserNotInDatabase;
 import org.eclipse.osee.framework.jdk.core.util.DateUtil;
@@ -113,14 +114,17 @@ public class NoteItem {
             for (int i = 0; i < nodes.getLength(); i++) {
                Element element = (Element) nodes.item(i);
                try {
-                  IAtsUser user = AtsUsers.getUser(element.getAttribute("userId"));
+                  IAtsUser user = AtsClientService.get().getUserAdmin().getUserById(element.getAttribute("userId"));
                   NoteItem item = new NoteItem(element.getAttribute("type"), element.getAttribute("state"), // NOPMD by b0727536 on 9/29/10 8:52 AM
                      element.getAttribute("date"), user, element.getAttribute("msg"));
                   logItems.add(item);
                } catch (UserNotInDatabase ex) {
                   OseeLog.logf(Activator.class, Level.SEVERE, ex, "Error parsing notes for [%s]", hrid);
-                  NoteItem item = new NoteItem(element.getAttribute("type"), element.getAttribute("state"), // NOPMD by b0727536 on 9/29/10 8:52 AM
-                     element.getAttribute("date"), AtsUsers.getGuestUser(), element.getAttribute("msg"));
+                  NoteItem item =
+                     new NoteItem(element.getAttribute("type"),
+                        element.getAttribute("state"), // NOPMD by b0727536 on 9/29/10 8:52 AM
+                        element.getAttribute("date"), AtsCoreUsers.GUEST_USER,
+                        element.getAttribute("msg"));
                   logItems.add(item);
                }
             }
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionHelperAdapter.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionHelperAdapter.java
index b59083eb9d1..6b750b5c90b 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionHelperAdapter.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionHelperAdapter.java
@@ -11,10 +11,10 @@
 package org.eclipse.osee.ats.core.client.workflow.transition;
 
 import org.eclipse.osee.ats.core.client.branch.AtsBranchManagerCore;
+import org.eclipse.osee.ats.core.client.internal.AtsClientService;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
-import org.eclipse.osee.ats.core.users.AtsUsers;
+import org.eclipse.osee.ats.core.users.AtsCoreUsers;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 
 /**
@@ -49,12 +49,12 @@ public abstract class TransitionHelperAdapter implements ITransitionHelper {
 
    @Override
    public boolean isSystemUser() throws OseeCoreException {
-      return AtsUsers.isGuestUser(AtsUsersClient.getUser()) || AtsUsers.isSystemUser(AtsUsersClient.getUser());
+      return AtsCoreUsers.isAtsCoreUser(AtsClientService.get().getUserAdmin().getCurrentUser());
    }
 
    @Override
    public boolean isSystemUserAssingee(AbstractWorkflowArtifact awa) throws OseeCoreException {
-      return awa.getStateMgr().getAssignees().contains(AtsUsers.getGuestUser()) || awa.getStateMgr().getAssignees().contains(
-         AtsUsers.getSystemUser());
+      return awa.getStateMgr().getAssignees().contains(AtsCoreUsers.GUEST_USER) || awa.getStateMgr().getAssignees().contains(
+         AtsCoreUsers.SYSTEM_USER);
    }
 }
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManager.java
index 07c476c4907..2da8f918130 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManager.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManager.java
@@ -28,6 +28,7 @@ import org.eclipse.osee.ats.api.workdef.ReviewBlockType;
 import org.eclipse.osee.ats.api.workdef.RuleDefinitionOption;
 import org.eclipse.osee.ats.api.workdef.WidgetResult;
 import org.eclipse.osee.ats.core.client.internal.Activator;
+import org.eclipse.osee.ats.core.client.internal.AtsClientService;
 import org.eclipse.osee.ats.core.client.review.AbstractReviewArtifact;
 import org.eclipse.osee.ats.core.client.review.ReviewManager;
 import org.eclipse.osee.ats.core.client.review.ValidateReviewManager;
@@ -35,14 +36,13 @@ import org.eclipse.osee.ats.core.client.task.AbstractTaskableArtifact;
 import org.eclipse.osee.ats.core.client.task.TaskArtifact;
 import org.eclipse.osee.ats.core.client.team.TeamState;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
 import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.client.util.WorkflowManagerCore;
 import org.eclipse.osee.ats.core.client.validator.AtsXWidgetValidateManagerClient;
 import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
 import org.eclipse.osee.ats.core.client.workflow.log.LogType;
 import org.eclipse.osee.ats.core.config.AtsVersionService;
-import org.eclipse.osee.ats.core.users.AtsUsers;
+import org.eclipse.osee.ats.core.users.AtsCoreUsers;
 import org.eclipse.osee.ats.core.workflow.transition.TransitionResult;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.util.Result;
@@ -149,7 +149,7 @@ public class TransitionManager {
                // Validate Editable
                boolean stateIsEditable =
                   WorkflowManagerCore.isEditable(awa, awa.getStateDefinition(), helper.isPrivilegedEditEnabled());
-               boolean currentlyUnAssigned = awa.getStateMgr().getAssignees().contains(AtsUsers.getUnAssigned());
+               boolean currentlyUnAssigned = awa.getStateMgr().getAssignees().contains(AtsCoreUsers.UNASSIGNED_USER);
                awa.getStateMgr().validateNoBootstrapUser();
                boolean overrideAssigneeCheck = helper.isOverrideAssigneeCheck();
                // Allow anyone to transition any task to completed/cancelled/working if parent is working
@@ -502,7 +502,7 @@ public class TransitionManager {
     */
    public IAtsUser getTransitionAsUser() throws OseeCoreException {
       if (transitionAsUser == null) {
-         return AtsUsersClient.getUser();
+         return AtsClientService.get().getUserAdmin().getCurrentUser();
       }
       return transitionAsUser;
    }
@@ -545,15 +545,15 @@ public class TransitionManager {
                   assignees.add(user);
                }
             }
-            if (assignees.contains(AtsUsers.getUnAssigned())) {
-               assignees.remove(AtsUsers.getUnAssigned());
-               assignees.add(AtsUsersClient.getUser());
+            if (assignees.contains(AtsCoreUsers.UNASSIGNED_USER)) {
+               assignees.remove(AtsCoreUsers.UNASSIGNED_USER);
+               assignees.add(AtsClientService.get().getUserAdmin().getCurrentUser());
             }
             if (assignees.isEmpty()) {
                if (helper.isSystemUser()) {
-                  assignees.add(AtsUsers.getUnAssigned());
+                  assignees.add(AtsCoreUsers.UNASSIGNED_USER);
                } else {
-                  assignees.add(AtsUsersClient.getUser());
+                  assignees.add(AtsClientService.get().getUserAdmin().getCurrentUser());
                }
             }
          }