diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/IPersistentEntityTuple.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/IPersistentEntityTuple.java
new file mode 100644
index 000000000..d8ed1b4f4
--- /dev/null
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/IPersistentEntityTuple.java
@@ -0,0 +1,22 @@
+package edu.internet2.tier.shibboleth.admin.ui.security.permission;
+
+import java.io.Serializable;
+
+/**
+ * Will be used as a key for PersmissionEvaluator return types
+ */
+public interface IPersistentEntityTuple extends Serializable {
+    /**
+     * Returns the database id of the database-entity. The id may originally be string, int, long, etc - it will be up to implementing
+     * code to correctly hand the id based on the type of entity when using the id to fetch.
+     * @return String the id of the entity.
+     */
+    String getId();
+
+    /**
+     * The persistant entity type associated with the id
+     * @return the class of the database entity that the id is associated with
+     */
+    Class getType();
+
+}
\ No newline at end of file
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/IShibUiPermissionEvaluator.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/IShibUiPermissionEvaluator.java
new file mode 100644
index 000000000..6d3bb1944
--- /dev/null
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/IShibUiPermissionEvaluator.java
@@ -0,0 +1,24 @@
+package edu.internet2.tier.shibboleth.admin.ui.security.permission;
+
+import org.springframework.security.access.PermissionEvaluator;
+import org.springframework.security.core.Authentication;
+
+import java.util.Collection;
+import java.util.Map;
+
+public interface IShibUiPermissionEvaluator extends PermissionEvaluator {
+//
+//    /**
+//     * For a given permission, find all the persistant entities a user has rights to.
+//     */
+//    Collection getPersistentEntitiesWithPermission(Authentication authentication, Object permission);
+//
+//    /**
+//     * Get ALL persistent entities that user has access to
+//     * @param authentication
+//     * @return a map. The key value will be the entity tuple and the value portions will be the set of permissions a user has on those objects
+//     */
+//    Map<IPersistentEntityTuple, Object> getPersistentEntities(Authentication authentication);
+
+    Collection getPersistentEntities(Authentication authentication, ShibUiType type, PermissionType permissionType);
+}
\ No newline at end of file
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/PermissionType.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/PermissionType.java
new file mode 100644
index 000000000..a0bf59af2
--- /dev/null
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/PermissionType.java
@@ -0,0 +1,5 @@
+package edu.internet2.tier.shibboleth.admin.ui.security.permission;
+
+public enum PermissionType {
+    admin, enable, approver, user;
+}
\ No newline at end of file
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/ShibUiService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/ShibUiService.java
new file mode 100644
index 000000000..9a8271402
--- /dev/null
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/ShibUiService.java
@@ -0,0 +1,4 @@
+package edu.internet2.tier.shibboleth.admin.ui.security.permission;
+
+public class ShibUiService {
+}
\ No newline at end of file
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/ShibUiType.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/ShibUiType.java
new file mode 100644
index 000000000..250f54eb3
--- /dev/null
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/ShibUiType.java
@@ -0,0 +1,5 @@
+package edu.internet2.tier.shibboleth.admin.ui.security.permission;
+
+public enum ShibUiType {
+    approvable, entityDescriptor
+}
\ No newline at end of file
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/IPersistentEntityTuple.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/IPersistentEntityTuple.java
deleted file mode 100644
index 7bc796793..000000000
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/IPersistentEntityTuple.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package edu.internet2.tier.shibboleth.admin.ui.security.service;
-
-import java.io.Serializable;
-
-/**
- * Will be used as a key for PersmissionEvaluator return types
- */
-public interface IPersistentEntityTuple extends Serializable {
-
-    String getId();
-
-    Class getType();
-
-}
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/IShibUiPermissionEvaluator.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/IShibUiPermissionEvaluator.java
deleted file mode 100644
index 0f4a144bf..000000000
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/IShibUiPermissionEvaluator.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package edu.internet2.tier.shibboleth.admin.ui.security.service;
-
-import org.springframework.security.access.PermissionEvaluator;
-import org.springframework.security.core.Authentication;
-
-import java.util.Collection;
-import java.util.Map;
-
-public interface IShibUiPermissionEvaluator extends PermissionEvaluator {
-
-    Collection getPersistentEntitiesWithPermission(Authentication authentication, Object permission);
-
-    /**
-     * Get ALL persistent entities that user has access to
-     * @param authentication
-     * @return
-     */
-    Map<IPersistentEntityTuple, Object> getPersistentEntities(Authentication authentication);
-
-    Map<IPersistentEntityTuple, Object> getPersistentEntities(Authentication authentication, Class clazz);
-
-}
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/UserService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/UserService.java
index 44de0f9d6..684be9009 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/UserService.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/UserService.java
@@ -18,6 +18,7 @@
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -108,6 +109,10 @@ public Optional<User> findByUsername(String username) {
         return userRepository.findByUsername(username);
     }
 
+    public Authentication getCurrentUserAuthentication() {
+        return SecurityContextHolder.getContext().getAuthentication();
+    }
+
     public User getCurrentUser() {
         //TODO: Consider returning an Optional here
         User user = null;