diff --git a/Assets/Scripts/BazookaManager.cs b/Assets/Scripts/BazookaManager.cs
index ac01534..fce22ec 100644
--- a/Assets/Scripts/BazookaManager.cs
+++ b/Assets/Scripts/BazookaManager.cs
@@ -2,6 +2,7 @@ using System.IO;
 using System.Numerics;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using Unity.VisualScripting;
 using UnityEngine;
 
 public class BazookaManager : MonoBehaviour
@@ -138,10 +139,10 @@ public class BazookaManager : MonoBehaviour
         return int.Parse(saveFile["bird"]["pastOverlay"].ToString());
     }
     
-    public void SetCustomBirdIconData(JObject value)
+    public void SetCustomBirdIconData(MarketplaceIconStorageType value)
     {
         if (saveFile["bird"] == null) saveFile["bird"] = new JObject();
-        saveFile["bird"]["customIcon"] = value;
+        saveFile["bird"]["customIcon"] = value.ConvertTo<JObject>();
     }
 
     public void UnsetCustomBirdIconData()
@@ -151,11 +152,11 @@ public class BazookaManager : MonoBehaviour
         (saveFile["bird"] as JObject)?.Remove("customIcon");
     }
 
-    public JObject GetCustomBirdIconData()
+    public MarketplaceIconStorageType GetCustomBirdIconData()
     {
         if (saveFile["bird"] == null) return new();
         if (saveFile["bird"]["customIcon"] == null) return new();
-        return saveFile["bird"]["customIcon"] as JObject;
+        return saveFile["bird"]["customIcon"].ToObject<MarketplaceIconStorageType>();
     }
 
     //Settings stuff
diff --git a/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs b/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs
index d35ef87..0aa2968 100644
--- a/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs
+++ b/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs
@@ -70,14 +70,14 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour
             var jsonResponse = JArray.Parse(response);
             foreach (var item in jsonResponse)
             {
-                DownloadIconType entry = ((JObject)item).ToObject<DownloadIconType>();
+                MarketplaceIconType entry = ((JObject)item).ToObject<MarketplaceIconType>();
                 GameObject newIcon = Instantiate(sample, content.transform);
                 newIcon.name = "IconEntry";
 
                 Tools.RenderFromBase64(entry.Data, newIcon.transform.GetChild(0).GetChild(0).GetComponent<Image>());
                 newIcon.transform.GetChild(1).GetComponent<TMP_Text>().text = "Bird Name: " + entry.Name;
                 newIcon.transform.GetChild(2).GetComponent<TMP_Text>().text = "Price " + entry.Price + " coin";
-                newIcon.transform.GetChild(3).GetComponent<TMP_Text>().text = "Designer Name: " + entry.Username;
+                newIcon.transform.GetChild(3).GetComponent<TMP_Text>().text = "Designer Name: " + entry.CreatorUsername;
                 newIcon.transform.GetChild(4).GetChild(0).GetComponent<TMP_Text>().text = "Purchase";
                 newIcon.transform.GetChild(4).GetComponent<Button>().onClick.AddListener(() => HandlePurchase(entry));
 
@@ -86,7 +86,7 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour
         }
     }
 
-    void HandlePurchase(DownloadIconType data)
+    void HandlePurchase(MarketplaceIconType data)
     {
         //will work on this
     }
diff --git a/Assets/Scripts/IconMarketplace/IconMarketplaceManager.cs b/Assets/Scripts/IconMarketplace/IconMarketplaceManager.cs
index 36a880c..459de81 100644
--- a/Assets/Scripts/IconMarketplace/IconMarketplaceManager.cs
+++ b/Assets/Scripts/IconMarketplace/IconMarketplaceManager.cs
@@ -42,14 +42,14 @@ public class IconMarketplaceManager : MonoBehaviour
         switch (panelIndex)
         {
             case 0:
-                coinText.text = "You have " + Tools.FormatWithCommas((BazookaManager.Instance.GetCustomBirdIconData()["totalCoins"] ?? "0").ToString()) + " coins";
+                coinText.text = "You have " + Tools.FormatWithCommas(BazookaManager.Instance.GetCustomBirdIconData().Balance) + " coins";
                 normalPanel.SetActive(true);
                 downloadPanel.SetActive(false);
                 uploadPanel.SetActive(false);
                 break;
             case 1:
                 downloadPanelScript.Load();
-                downloadPanelScript.balanceText.text = "You have " + Tools.FormatWithCommas((BazookaManager.Instance.GetCustomBirdIconData()["totalCoins"] ?? "0").ToString()) + " coins to spend";
+                downloadPanelScript.balanceText.text = "You have " + Tools.FormatWithCommas(BazookaManager.Instance.GetCustomBirdIconData().Balance) + " coins to spend";
                 normalPanel.SetActive(false);
                 downloadPanel.SetActive(true);
                 uploadPanel.SetActive(false);
diff --git a/Assets/Scripts/Types/MarketplaceIconStorageType.cs b/Assets/Scripts/Types/MarketplaceIconStorageType.cs
new file mode 100644
index 0000000..ec57a02
--- /dev/null
+++ b/Assets/Scripts/Types/MarketplaceIconStorageType.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Numerics;
+using Newtonsoft.Json;
+
+public class MarketplaceIconStorageType {
+  [JsonProperty("selected")]
+  public string Selected { get; set; } = null;
+  [JsonProperty("balance")]
+  public BigInteger Balance { get; set; } = 0;
+  [JsonProperty("data")]
+  public MarketplaceIconType[] Data { get; set; } = Array.Empty<MarketplaceIconType>();
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Types/MarketplaceIconStorageType.cs.meta b/Assets/Scripts/Types/MarketplaceIconStorageType.cs.meta
new file mode 100644
index 0000000..5c3f7fc
--- /dev/null
+++ b/Assets/Scripts/Types/MarketplaceIconStorageType.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: b8760344b405294a99c83390f622524d
\ No newline at end of file
diff --git a/Assets/Scripts/Types/DownloadIconType.cs b/Assets/Scripts/Types/MarketplaceIconType.cs
similarity index 71%
rename from Assets/Scripts/Types/DownloadIconType.cs
rename to Assets/Scripts/Types/MarketplaceIconType.cs
index 51b2b22..b5f2369 100644
--- a/Assets/Scripts/Types/DownloadIconType.cs
+++ b/Assets/Scripts/Types/MarketplaceIconType.cs
@@ -1,10 +1,10 @@
 using Newtonsoft.Json;
 
-public class DownloadIconType {
+public class MarketplaceIconType {
   [JsonProperty("username")]
-  public string Username { get; set; }
+  public string CreatorUsername { get; set; }
   [JsonProperty("userid")]
-  public string UserID { get; set; }
+  public string CreatorUserID { get; set; }
   [JsonProperty("data")]
   public string Data { get; set; }
   [JsonProperty("uuid")]
diff --git a/Assets/Scripts/Types/DownloadIconType.cs.meta b/Assets/Scripts/Types/MarketplaceIconType.cs.meta
similarity index 100%
rename from Assets/Scripts/Types/DownloadIconType.cs.meta
rename to Assets/Scripts/Types/MarketplaceIconType.cs.meta