diff --git a/components/extra/ExtraWeaponsGrid/index.tsx b/components/extra/ExtraWeaponsGrid/index.tsx
index 00874b65..00b3ffbf 100644
--- a/components/extra/ExtraWeaponsGrid/index.tsx
+++ b/components/extra/ExtraWeaponsGrid/index.tsx
@@ -17,6 +17,7 @@ interface Props {
   removeWeapon: (id: string) => void
   updateObject: (object: SearchableObject, position: number) => void
   updateUncap: (id: string, position: number, uncap: number) => void
+  updateTranscendence: (id: string, position: number, stage: number) => void
 }
 
 // Constants
@@ -29,6 +30,7 @@ const ExtraWeaponsGrid = ({
   removeWeapon,
   updateObject,
   updateUncap,
+  updateTranscendence,
 }: Props) => {
   return (
     <ul className={styles.grid}>
@@ -47,6 +49,7 @@ const ExtraWeaponsGrid = ({
               removeWeapon={removeWeapon}
               updateObject={updateObject}
               updateUncap={updateUncap}
+              updateTranscendence={updateTranscendence}
             />
           </li>
         )
diff --git a/components/weapon/WeaponGrid/index.tsx b/components/weapon/WeaponGrid/index.tsx
index aa0a0a0a..a6e044cf 100644
--- a/components/weapon/WeaponGrid/index.tsx
+++ b/components/weapon/WeaponGrid/index.tsx
@@ -65,6 +65,10 @@ const WeaponGrid = (props: Props) => {
   const [previousUncapValues, setPreviousUncapValues] = useState<{
     [key: number]: number
   }>({})
+  const [previousTranscendenceStages, setPreviousTranscendenceStages] =
+    useState<{
+      [key: number]: number
+    }>({})
 
   // Initialize an array of current uncap values for each weapon
   useEffect(() => {
@@ -90,13 +94,16 @@ const WeaponGrid = (props: Props) => {
       const payload: DetailsObject = { extra: party.extra }
       props.createParty(payload).then((team) => {
         saveWeapon(team.id, weapon, position).then((response) => {
-          if (response) storeGridWeapon(response.data.grid_weapon)
+          if (response && response.data.grid_weapon) {
+            storeGridWeapon(response.data.grid_weapon)
+          }
         })
       })
     } else {
       if (props.editable)
         saveWeapon(party.id, weapon, position)
           .then((response) => {
+            console.log(response)
             if (response) handleWeaponResponse(response.data)
           })
           .catch((error) => {
@@ -135,7 +142,12 @@ const WeaponGrid = (props: Props) => {
       if (data.position) setPosition(data.position)
       setModalOpen(true)
     } else {
-      storeGridWeapon(data.grid_weapon)
+      if (data.grid_weapon) {
+        storeGridWeapon(data.grid_weapon)
+      } else {
+        console.error('No grid weapon returned')
+        console.log(data)
+      }
 
       // If we replaced an existing weapon, remove it from the grid
       if (data.hasOwnProperty('meta') && data.meta['replaced'] !== undefined) {
@@ -217,7 +229,12 @@ const WeaponGrid = (props: Props) => {
           })
 
           // Store new character in state
-          storeGridWeapon(response.data.grid_weapon)
+          if (response.data.grid_weapon)
+            storeGridWeapon(response.data.grid_weapon)
+          else {
+            console.error('No grid weapon returned')
+            console.log(response.data)
+          }
 
           // Reset conflict
           resetConflict()
@@ -335,6 +352,110 @@ const WeaponGrid = (props: Props) => {
     setPreviousUncapValues(newPreviousValues)
   }
 
+  // Methods: Updating transcendence stage
+  // Note: Saves, but debouncing is not working properly
+  async function saveTranscendence(
+    id: string,
+    position: number,
+    stage: number
+  ) {
+    storePreviousUncapValue(position)
+    storePreviousTranscendenceStage(position)
+
+    const payload = {
+      weapon: {
+        uncap_level: stage > 0 ? 6 : 5,
+        transcendence_step: stage,
+      },
+    }
+
+    try {
+      if (stage != previousTranscendenceStages[position])
+        await api.updateTranscendence('weapon', id, stage).then((response) => {
+          storeGridWeapon(response.data.grid_weapon)
+        })
+    } catch (error) {
+      console.error(error)
+
+      // Revert optimistic UI
+      updateUncapLevel(position, previousUncapValues[position])
+      updateTranscendenceStage(position, previousTranscendenceStages[position])
+
+      // Remove optimistic key
+      let newPreviousTranscendenceStages = { ...previousTranscendenceStages }
+      let newPreviousUncapValues = { ...previousUncapValues }
+
+      delete newPreviousTranscendenceStages[position]
+      delete newPreviousUncapValues[position]
+
+      setPreviousTranscendenceStages(newPreviousTranscendenceStages)
+      setPreviousUncapValues(newPreviousUncapValues)
+    }
+  }
+
+  function initiateTranscendenceUpdate(
+    id: string,
+    position: number,
+    stage: number
+  ) {
+    if (props.editable) {
+      memoizeTranscendenceAction(id, position, stage)
+
+      // Optimistically update UI
+      updateTranscendenceStage(position, stage)
+
+      if (stage > 0) {
+        updateUncapLevel(position, 6)
+      }
+    }
+  }
+
+  const memoizeTranscendenceAction = useCallback(
+    (id: string, position: number, stage: number) => {
+      debouncedTranscendenceAction(id, position, stage)
+    },
+    [props, previousTranscendenceStages]
+  )
+
+  const debouncedTranscendenceAction = useMemo(
+    () =>
+      debounce((id, position, number) => {
+        saveTranscendence(id, position, number)
+      }, 500),
+    [props, saveTranscendence]
+  )
+
+  const updateTranscendenceStage = (position: number, stage: number) => {
+    // console.log(`Updating uncap level at position ${position} to ${uncapLevel}`)
+    if (appState.grid.weapons.mainWeapon && position == -1)
+      appState.grid.weapons.mainWeapon.transcendence_step = stage
+    else {
+      const weapon = appState.grid.weapons.allWeapons[position]
+      if (weapon) {
+        weapon.transcendence_step = stage
+        appState.grid.weapons.allWeapons[position] = weapon
+      }
+    }
+  }
+
+  function storePreviousTranscendenceStage(position: number) {
+    // Save the current value in case of an unexpected result
+    let newPreviousValues = { ...previousUncapValues }
+
+    if (appState.grid.weapons.mainWeapon && position == -1) {
+      newPreviousValues[position] = appState.grid.weapons.mainWeapon.uncap_level
+    } else {
+      const weapon = appState.grid.weapons.allWeapons[position]
+      if (weapon) {
+        newPreviousValues[position] = weapon.uncap_level
+      } else {
+        newPreviousValues[position] = 0
+      }
+    }
+
+    setPreviousUncapValues(newPreviousValues)
+  }
+
   // Methods: Convenience
   const displayExtraContainer =
     props.editable ||
@@ -352,6 +473,7 @@ const WeaponGrid = (props: Props) => {
       removeWeapon={removeWeapon}
       updateObject={receiveWeaponFromSearch}
       updateUncap={initiateUncapUpdate}
+      updateTranscendence={initiateTranscendenceUpdate}
     />
   )
 
@@ -370,6 +492,7 @@ const WeaponGrid = (props: Props) => {
           removeWeapon={removeWeapon}
           updateObject={receiveWeaponFromSearch}
           updateUncap={initiateUncapUpdate}
+          updateTranscendence={initiateTranscendenceUpdate}
         />
       </li>
     )
@@ -388,6 +511,7 @@ const WeaponGrid = (props: Props) => {
                 removeWeapon={removeWeapon}
                 updateObject={receiveWeaponFromSearch}
                 updateUncap={initiateUncapUpdate}
+                updateTranscendence={initiateTranscendenceUpdate}
               />
             )}
           </ExtraContainerItem>
diff --git a/components/weapon/WeaponUnit/index.tsx b/components/weapon/WeaponUnit/index.tsx
index 92c7bf77..41e9f1e3 100644
--- a/components/weapon/WeaponUnit/index.tsx
+++ b/components/weapon/WeaponUnit/index.tsx
@@ -37,6 +37,7 @@ interface Props {
   removeWeapon: (id: string) => void
   updateObject: (object: SearchableObject, position: number) => void
   updateUncap: (id: string, position: number, uncap: number) => void
+  updateTranscendence: (id: string, position: number, stage: number) => void
 }
 
 const WeaponUnit = ({
@@ -47,6 +48,7 @@ const WeaponUnit = ({
   removeWeapon: sendWeaponToRemove,
   updateObject,
   updateUncap,
+  updateTranscendence,
 }: Props) => {
   // Translations and locale
   const { t } = useTranslation('common')
@@ -130,6 +132,10 @@ const WeaponUnit = ({
     if (gridWeapon) updateUncap(gridWeapon.id, position, index)
   }
 
+  function passTranscendenceData(stage: number) {
+    if (gridWeapon) updateTranscendence(gridWeapon.id, position, stage)
+  }
+
   function removeWeapon() {
     if (gridWeapon) sendWeaponToRemove(gridWeapon.id)
     setAlertOpen(false)
@@ -559,18 +565,20 @@ const WeaponUnit = ({
       <div className={classes}>
         {contextMenu()}
         {image()}
-        {gridWeapon && weapon ? (
+        {gridWeapon && (
           <UncapIndicator
             type="weapon"
             ulb={gridWeapon.object.uncap.ulb || false}
             flb={gridWeapon.object.uncap.flb || false}
+            transcendence={gridWeapon.object.uncap.transcendence || false}
+            editable={editable}
             uncapLevel={gridWeapon.uncap_level}
+            transcendenceStage={gridWeapon.transcendence_step}
             position={gridWeapon.position}
             updateUncap={passUncapData}
+            updateTranscendence={passTranscendenceData}
             special={false}
           />
-        ) : (
-          ''
         )}
         <h3 className={styles.name}>{weapon?.name[locale]}</h3>
       </div>