diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUsers.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUsers.java
index a88203bf..87beb9c4 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUsers.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUsers.java
@@ -4,6 +4,7 @@ import com.google.common.collect.HashBiMap;
 import com.hibiscusmc.hmccosmetics.util.HMCCServerUtils;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Set;
@@ -11,31 +12,58 @@ import java.util.UUID;
 
 public class CosmeticUsers {
 
-    private static HashBiMap<UUID, CosmeticUser> COSMETIC_USERS = HashBiMap.create();
+    private static final HashBiMap<UUID, CosmeticUser> COSMETIC_USERS = HashBiMap.create();
 
-    public static void addUser(CosmeticUser user) {
+    /**
+     * Adds a user to the Hashmap of stored CosmeticUsers. This will not override an entry if it already exists. If you need to override, delete then add.
+     * @param user The user to add to the HashMap.
+     */
+    public static void addUser(@NotNull CosmeticUser user) {
         if (COSMETIC_USERS.containsKey(user.getUniqueId())) return; // do not add if already exists
         COSMETIC_USERS.put(user.getUniqueId(), user);
     }
 
+    /**
+     * Removes a CosmeticUser from the Hashmap
+     * @param uuid The UUID to remove.
+     */
     public static void removeUser(UUID uuid) {
         COSMETIC_USERS.remove(uuid);
     }
 
-    public static void removeUser(CosmeticUser user) {
-        COSMETIC_USERS.remove(user);
+    /**
+     * Removes a CosmeticUser from the hashmap by their CosmeticUser method
+     * @param user The user to be removed (will get their UUID from this class)
+     */
+    public static void removeUser(@NotNull CosmeticUser user) {
+        COSMETIC_USERS.remove(user.getUniqueId());
     }
 
+    /**
+     * This method allows you to get a CosmeticUser from their UUID. If you are using not internally, HIGHLY recommend to use the API implementation of this.
+     * @param uuid The UUID of the user that you wish to lookup.
+     * @return Returns the user if there is a valid user, returns null if not.
+     */
     @Nullable
     public static CosmeticUser getUser(UUID uuid) {
         return COSMETIC_USERS.get(uuid);
     }
 
+    /**
+     * This method allows you to get a CosmeticUser from just using the player class. This just allows you to have a bit less boilerplate.
+     * @param player The player to lookup (will take their UUID from the class)
+     * @return Returns the user if there is a vlaid user, returns null if not.
+     */
     @Nullable
-    public static CosmeticUser getUser(Player player) {
+    public static CosmeticUser getUser(@NotNull Player player) {
         return COSMETIC_USERS.get(player.getUniqueId());
     }
 
+    /**
+     * This method gets the CosmeticUser from an entity id (said entity must be a player). This is not ideal, as it requires the plugin to go through all entities, but it's a possibility.
+     * @param entityId The entity ID in an integer.
+     * @return The cosmetic user if there is an entity id associated with that.
+     */
     @Nullable
     public static CosmeticUser getUser(int entityId) {
         Entity entity = HMCCServerUtils.getEntity(entityId);
@@ -44,6 +72,11 @@ public class CosmeticUsers {
         return COSMETIC_USERS.get(player.getUniqueId());
     }
 
+    /**
+     * Gets all the values for CosmeticUsers to allow you to iterate over everyone.
+     * @return CosmeticUsers in a set. This will never be null, but might be empty.
+     */
+    @NotNull
     public static Set<CosmeticUser> values() {
         return COSMETIC_USERS.values();
     }