diff --git a/exporter/SynthesisFusionAddin/src/Parser/ExporterOptions.py b/exporter/SynthesisFusionAddin/src/Parser/ExporterOptions.py
index 1eb34e9e52..39f6c276b7 100644
--- a/exporter/SynthesisFusionAddin/src/Parser/ExporterOptions.py
+++ b/exporter/SynthesisFusionAddin/src/Parser/ExporterOptions.py
@@ -32,7 +32,7 @@ class ExporterOptions:
     # Python's `os` module can return `None` when attempting to find the home directory if the
     # user's computer has conflicting configs of some sort. This has happened and should be accounted
     # for accordingly.
-    fileLocation: str | None = field(
+    fileLocation: str | os.PathLike[str] | None = field(
         default=(os.getenv("HOME") if platform.system() == "Windows" else os.path.expanduser("~"))
     )
     name: str | None = field(default=None)
@@ -52,7 +52,7 @@ class ExporterOptions:
     compressOutput: bool = field(default=True)
     exportAsPart: bool = field(default=False)
 
-    exportLocation: ExportLocation = field(default=ExportLocation.UPLOAD)
+    exportLocation: ExportLocation = field(default=ExportLocation.DOWNLOAD)
 
     hierarchy: ModelHierarchy = field(default=ModelHierarchy.FusionAssembly)
     visualQuality: TriangleMeshQualityOptions = field(default=TriangleMeshQualityOptions.LowQualityTriangleMesh)
diff --git a/exporter/SynthesisFusionAddin/src/Resources/HTML/info.html b/exporter/SynthesisFusionAddin/src/Resources/HTML/info.html
index a44b45f115..759ed2a48d 100644
--- a/exporter/SynthesisFusionAddin/src/Resources/HTML/info.html
+++ b/exporter/SynthesisFusionAddin/src/Resources/HTML/info.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <script>
-            window.location.replace("https://synthesis.autodesk.com/tutorials.html")
+            window.location.replace("https://synthesis.autodesk.com/codelab/FusionExporterCodelab/index.html#0")
         </script>
         <style>
             .redirecting {
@@ -18,4 +18,4 @@
             <h1>Redirecting...</h1>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/exporter/SynthesisFusionAddin/src/Types.py b/exporter/SynthesisFusionAddin/src/Types.py
index bb714b27f0..8efa7695da 100644
--- a/exporter/SynthesisFusionAddin/src/Types.py
+++ b/exporter/SynthesisFusionAddin/src/Types.py
@@ -85,6 +85,8 @@ class ModelHierarchy(Enum):
 KG: TypeAlias = float
 LBS: TypeAlias = float
 PRIMITIVES = (bool, str, int, float, type(None))
+
+# All currently supported Fusion joints
 SELECTABLE_JOINT_TYPES = (adsk.fusion.JointTypes.RevoluteJointType, adsk.fusion.JointTypes.SliderJointType)
 
 
diff --git a/exporter/SynthesisFusionAddin/src/UI/Camera.py b/exporter/SynthesisFusionAddin/src/UI/Camera.py
index 4b83062687..53168fd24d 100644
--- a/exporter/SynthesisFusionAddin/src/UI/Camera.py
+++ b/exporter/SynthesisFusionAddin/src/UI/Camera.py
@@ -9,7 +9,7 @@
 
 
 @logFailure
-def captureThumbnail(size: int = 250) -> str:
+def captureThumbnail(size: int = 250) -> str | os.PathLike[str]:
     """
     ## Captures Thumbnail and saves it to a temporary path - needs to be cleared after or on startup
     - Size: int (Default: 200) : (width & height)
diff --git a/exporter/SynthesisFusionAddin/src/UI/ConfigCommand.py b/exporter/SynthesisFusionAddin/src/UI/ConfigCommand.py
index 8f73d0a68c..7d9d97f718 100644
--- a/exporter/SynthesisFusionAddin/src/UI/ConfigCommand.py
+++ b/exporter/SynthesisFusionAddin/src/UI/ConfigCommand.py
@@ -1,7 +1,8 @@
-""" Generate all the front-end command inputs and GUI elements.
-    links the Configuration Command seen when pressing the Synthesis button in the Addins Panel
+"""
+Central location for which all UI is generated and handled for the main configuration panel.
 """
 
+import os
 from typing import Any
 
 import adsk.core
@@ -16,6 +17,7 @@
 from src.UI import FileDialogConfig
 from src.UI.GamepieceConfigTab import GamepieceConfigTab
 from src.UI.GeneralConfigTab import GeneralConfigTab
+from src.UI.Handlers import PersistentEventHandler
 from src.UI.JointConfigTab import JointConfigTab
 
 generalConfigTab: GeneralConfigTab
@@ -28,13 +30,34 @@
 
 
 class ConfigureCommandCreatedHandler(adsk.core.CommandCreatedEventHandler):
+    """Called when the panel is initially created."""
+
     def __init__(self, configure: Any) -> None:
         super().__init__()
 
     @logFailure(messageBox=True)
     def notify(self, args: adsk.core.CommandCreatedEventArgs) -> None:
-        exporterOptions = ExporterOptions().readFromDesign() or ExporterOptions()
         cmd = args.command
+        gm.ui.activeSelections.clear()
+        onExecute = ConfigureCommandExecuteHandler()
+        cmd.execute.add(onExecute)
+
+        onInputChanged = ConfigureCommandInputChanged()
+        cmd.inputChanged.add(onInputChanged)
+
+        onExecutePreview = CommandExecutePreviewHandler()
+        cmd.executePreview.add(onExecutePreview)
+
+        onSelect = MySelectHandler()
+        cmd.select.add(onSelect)
+
+        onPreSelectEnd = MyPreselectEndHandler(cmd)
+        cmd.preSelectEnd.add(onPreSelectEnd)
+
+        onDestroy = MyCommandDestroyHandler()
+        cmd.destroy.add(onDestroy)
+
+        exporterOptions = ExporterOptions().readFromDesign() or ExporterOptions()
 
         cmd.isAutoExecute = False
         cmd.isExecutedWhenPreEmpted = False
@@ -44,8 +67,7 @@ def notify(self, args: adsk.core.CommandCreatedEventArgs) -> None:
         global INPUTS_ROOT
         INPUTS_ROOT = cmd.commandInputs
 
-        # TODO?
-        # cmd.helpFile = os.path.join(".", "src", "Resources", "HTML", "info.html")
+        cmd.helpFile = os.path.join(".", "src", "Resources", "HTML", "info.html")
 
         global generalConfigTab
         generalConfigTab = GeneralConfigTab(args, exporterOptions)
@@ -54,45 +76,36 @@ def notify(self, args: adsk.core.CommandCreatedEventArgs) -> None:
         gamepieceConfigTab = GamepieceConfigTab(args, exporterOptions)
         generalConfigTab.gamepieceConfigTab = gamepieceConfigTab
 
-        if not exporterOptions.exportMode == ExportMode.FIELD:
-            gamepieceConfigTab.isVisible = False
-
-        if exporterOptions.gamepieces:
-            for synGamepiece in exporterOptions.gamepieces:
-                fusionOccurrence = gm.app.activeDocument.design.findEntityByToken(synGamepiece.occurrenceToken)[0]
-                gamepieceConfigTab.addGamepiece(fusionOccurrence, synGamepiece)
-
         global jointConfigTab
         jointConfigTab = JointConfigTab(args)
         generalConfigTab.jointConfigTab = jointConfigTab
 
+        if not exporterOptions.exportMode == ExportMode.FIELD:
+            gamepieceConfigTab.isVisible = False
+
         if not exporterOptions.exportMode == ExportMode.ROBOT:
             jointConfigTab.isVisible = False
 
-        # Transition: AARD-1685
-        # There remains some overlap between adding joints as wheels.
-        # Should investigate changes to improve performance.
-        if exporterOptions.joints:
+        design = adsk.fusion.Design.cast(adsk.core.Application.get().activeProduct)
+        for synGamepiece in exporterOptions.gamepieces:
+            fusionOccurrence = design.findEntityByToken(synGamepiece.occurrenceToken)[0]
+            gamepieceConfigTab.addGamepiece(fusionOccurrence, synGamepiece)
+
+        if len(exporterOptions.joints):
             for synJoint in exporterOptions.joints:
-                fusionJoints = gm.app.activeDocument.design.findEntityByToken(synJoint.jointToken)
+                fusionJoints = design.findEntityByToken(synJoint.jointToken)
                 if len(fusionJoints):
                     jointConfigTab.addJoint(fusionJoints[0], synJoint)
         else:
-            for joint in [
-                *gm.app.activeDocument.design.rootComponent.allJoints,
-                *gm.app.activeDocument.design.rootComponent.allAsBuiltJoints,
-            ]:
+            for joint in [*design.rootComponent.allJoints, *design.rootComponent.allAsBuiltJoints]:
                 if joint.jointMotion.jointType in SELECTABLE_JOINT_TYPES and not joint.isSuppressed:
                     jointConfigTab.addJoint(joint)
 
         # Adding saved wheels must take place after joints are added as a result of how the two types are connected.
-        # Transition: AARD-1685
-        # Should consider changing how the parser handles wheels and joints to avoid overlap
-        if exporterOptions.wheels:
-            for wheel in exporterOptions.wheels:
-                fusionJoints = gm.app.activeDocument.design.findEntityByToken(wheel.jointToken)
-                if len(fusionJoints):
-                    jointConfigTab.addWheel(fusionJoints[0], wheel)
+        for wheel in exporterOptions.wheels:
+            fusionJoints = design.findEntityByToken(wheel.jointToken)
+            if len(fusionJoints):
+                jointConfigTab.addWheel(fusionJoints[0], wheel)
 
         getAuth()
         user_info = getUserInfo()
@@ -101,45 +114,13 @@ def notify(self, args: adsk.core.CommandCreatedEventArgs) -> None:
         )
         apsSettings.tooltip = "Configuration settings for Autodesk Platform Services."
 
-        gm.ui.activeSelections.clear()
-        onExecute = ConfigureCommandExecuteHandler()
-        cmd.execute.add(onExecute)
-        gm.handlers.append(onExecute)
-
-        onInputChanged = ConfigureCommandInputChanged(cmd)
-        cmd.inputChanged.add(onInputChanged)
-        gm.handlers.append(onInputChanged)
-
-        onExecutePreview = CommandExecutePreviewHandler()
-        cmd.executePreview.add(onExecutePreview)
-        gm.handlers.append(onExecutePreview)
-
-        onSelect = MySelectHandler(cmd)
-        cmd.select.add(onSelect)
-        gm.handlers.append(onSelect)
-
-        onPreSelect = MyPreSelectHandler(cmd)
-        cmd.preSelect.add(onPreSelect)
-        gm.handlers.append(onPreSelect)
-
-        onPreSelectEnd = MyPreselectEndHandler(cmd)
-        cmd.preSelectEnd.add(onPreSelectEnd)
-        gm.handlers.append(onPreSelectEnd)
-
-        onDestroy = MyCommandDestroyHandler()
-        cmd.destroy.add(onDestroy)
-        gm.handlers.append(onDestroy)
 
+class ConfigureCommandExecuteHandler(PersistentEventHandler, adsk.core.CommandEventHandler):
+    """Called when the `Export` button is clicked from the main configuration panel."""
 
-class ConfigureCommandExecuteHandler(adsk.core.CommandEventHandler):
     @logFailure(messageBox=True)
-    def notify(self, args: adsk.core.CommandEventArgs) -> None:
+    def notify(self, _: adsk.core.CommandEventArgs) -> None:
         exporterOptions = ExporterOptions().readFromDesign()
-
-        if args.executeFailed:
-            logger.error("Could not execute configuration due to failure")
-            return
-
         processedFileName = gm.app.activeDocument.name.replace(" ", "_")
         if generalConfigTab.exportLocation == ExportLocation.DOWNLOAD:
             savepath = FileDialogConfig.saveFileDialog(defaultPath=exporterOptions.fileLocation)
@@ -152,21 +133,21 @@ def notify(self, args: adsk.core.CommandEventArgs) -> None:
 
         adsk.doEvents()
 
-        design = gm.app.activeDocument.design
+        design = adsk.fusion.Design.cast(adsk.core.Application.get().activeProduct)
 
-        name_split: list[str] = design.rootComponent.name.split(" ")
-        if len(name_split) < 2:
+        nameSplit = design.rootComponent.name.split(" ")
+        if len(nameSplit) < 2:
             gm.ui.messageBox("Please open the robot design you would like to export", "Synthesis: Error")
             return
 
-        name = name_split[0]
-        version = name_split[1]
+        name = nameSplit[0]
+        version = nameSplit[1]
 
         selectedJoints, selectedWheels = jointConfigTab.getSelectedJointsAndWheels()
         selectedGamepieces = gamepieceConfigTab.getGamepieces()
 
         exporterOptions = ExporterOptions(
-            str(savepath),
+            savepath,
             name,
             version,
             materials=0,
@@ -186,187 +167,47 @@ def notify(self, args: adsk.core.CommandEventArgs) -> None:
 
         Parser(exporterOptions).export()
         exporterOptions.writeToDesign()
-
-        # All selections should be reset AFTER a successful export and save.
-        # If we run into an exporting error we should return back to the panel with all current options
-        # still in tact. Even if they did not save.
         jointConfigTab.reset()
         gamepieceConfigTab.reset()
 
 
-class CommandExecutePreviewHandler(adsk.core.CommandEventHandler):
+class CommandExecutePreviewHandler(PersistentEventHandler, adsk.core.CommandEventHandler):
+    """Called when an execute command is ready to be previewed."""
+
     @logFailure(messageBox=True)
     def notify(self, args: adsk.core.CommandEventArgs) -> None:
         jointConfigTab.handlePreviewEvent(args)
         gamepieceConfigTab.handlePreviewEvent(args)
 
 
-class MySelectHandler(adsk.core.SelectionEventHandler):
-    def __init__(self, cmd: adsk.core.Command) -> None:
-        super().__init__()
-        self.cmd = cmd
-
-    @logFailure(messageBox=True)
-    def traverseAssembly(
-        self, child_occurrences: adsk.fusion.OccurrenceList, jointedOcc: dict[adsk.fusion.Joint, adsk.fusion.Occurrence]
-    ) -> (
-        list[adsk.fusion.Joint | adsk.fusion.Occurrence] | None
-    ):  # recursive traversal to check if children are jointed
-        """### Traverses the entire occurrence hierarchy to find a match (jointed occurrence) in self.occurrence
-
-        Args:
-            child_occurrences (adsk.fusion.OccurrenceList): a list of child occurrences
-
-        Returns:
-            occ (Occurrence): if a match is found, return the jointed occurrence
-            None: if no match is found
-        """
-        for occ in child_occurrences:
-            for joint, value in jointedOcc.items():
-                if occ in value:
-                    return [joint, occ]  # occurrence that is jointed
-
-            if occ.childOccurrences:  # if occurrence has children, traverse sub-tree
-                self.traverseAssembly(occ.childOccurrences, jointedOcc)
-        return None  # no jointed occurrence found
-
-    @logFailure(messageBox=True)
-    def wheelParent(self, occ: adsk.fusion.Occurrence) -> list[str | adsk.fusion.Occurrence | None]:
-        """### Identify an occurrence that encompasses the entire wheel component.
-
-        Process:
-
-            1. if the selection has no parent, return the selection.
-
-            2. if the selection is directly jointed, return the selection.
-
-            3. else keep climbing the occurrence tree until no parent is found.
-
-            - if a jointed occurrence is in the tree, return the selection parent.
-
-            - if no jointed occurrence was found, return the selection.
-
-        Args:
-            occ (Occurrence): The selected child occurrence
-
-        Returns:
-            occ (Occurrence): Wheel parent
-        """
-        parent = occ.assemblyContext
-        jointedOcc = {}  # dictionary with all jointed occurrences
-
-        try:
-            for joint in occ.joints:
-                if joint.jointMotion.jointType == adsk.fusion.JointTypes.RevoluteJointType:
-                    # gm.ui.messageBox("Selection is directly jointed.\nReturning selection.\n\n" + "Occurrence:\n--> " + occ.name + "\nJoint:\n--> " + joint.name)
-                    return [joint.entityToken, occ]
-        except:
-            for joint in occ.component.joints:
-                if joint.jointMotion.jointType == adsk.fusion.JointTypes.RevoluteJointType:
-                    # gm.ui.messageBox("Selection is directly jointed.\nReturning selection.\n\n" + "Occurrence:\n--> " + occ.name + "\nJoint:\n--> " + joint.name)
-                    return [joint.entityToken, occ]
-
-        if parent == None:  # no parent occurrence
-            # gm.ui.messageBox("Selection has no parent occurrence.\nReturning selection.\n\n" + "Occurrence:\n--> " + occ.name + "\nJoint:\n--> NONE")
-            return [None, occ]  # return what is selected
-
-        for joint in gm.app.activeDocument.design.rootComponent.allJoints:
-            if joint.jointMotion.jointType != adsk.fusion.JointTypes.RevoluteJointType:
-                continue
-            jointedOcc[joint.entityToken] = [
-                joint.occurrenceOne,
-                joint.occurrenceTwo,
-            ]
-
-        parentLevel = 1  # the number of nodes above the one selected
-        returned = None  # the returned value of traverseAssembly()
-        parentOccurrence = occ  # the parent occurrence that will be returned
-        treeParent = parent  # each parent that will traverse up in algorithm.
-
-        while treeParent != None:  # loops until reaches top-level component
-            returned = self.traverseAssembly(treeParent.childOccurrences, jointedOcc)
-
-            if returned != None:
-                for i in range(parentLevel):
-                    parentOccurrence = parentOccurrence.assemblyContext
-
-                # gm.ui.messageBox("Joint found.\nReturning parent occurrence.\n\n" + "Selected occurrence:\n--> " + occ.name + "\nParent:\n--> " + parentOccurrence.name + "\nJoint:\n--> " + returned[0] + "\nNodes above selection:\n--> " + str(parentLevel))
-                return [returned[0], parentOccurrence]
-
-            parentLevel += 1
-            treeParent = treeParent.assemblyContext
-        # gm.ui.messageBox("No jointed occurrence found.\nReturning selection.\n\n" + "Occurrence:\n--> " + occ.name + "\nJoint:\n--> NONE")
-        return [None, occ]  # no jointed occurrence found, return what is selected
+class MySelectHandler(PersistentEventHandler, adsk.core.SelectionEventHandler):
+    """Called when a selection in the current design is made."""
 
     @logFailure(messageBox=True)
     def notify(self, args: adsk.core.SelectionEventArgs) -> None:
-        """### Notify member is called when a selection event is triggered.
-
-        Args:
-            args (SelectionEventArgs): A selection event argument
-        """
         if gamepieceConfigTab.isVisible:
-            self.cmd.setCursor("", 0, 0)  # Reset select cursor back to normal cursor.
             gamepieceConfigTab.handleSelectionEvent(args, args.selection.entity)
 
         if jointConfigTab.isVisible:
-            self.cmd.setCursor("", 0, 0)  # Reset select cursor back to normal cursor.
             jointConfigTab.handleSelectionEvent(args, args.selection.entity)
 
 
-class MyPreSelectHandler(adsk.core.SelectionEventHandler):
-    """### Event fires when a entity preselection is made (mouse hovering).
-    ##### When a user is selecting geometry, they move the mouse over the model and if the entity the mouse is currently over is valid for selection it will highlight indicating that it can be selected. This process of determining what is available for selection and highlighting it is referred to as the "preselect" behavior.
-
-    Args: SelectionEventHandler
-    """
+class MyPreselectEndHandler(PersistentEventHandler, adsk.core.SelectionEventHandler):
+    """Called upon a pre-selection end in the current design. (Mouse hover off)"""
 
     def __init__(self, cmd: adsk.core.Command) -> None:
         super().__init__()
         self.cmd = cmd
 
     @logFailure(messageBox=True)
-    def notify(self, args: adsk.core.SelectionEventArgs) -> None:
-        design = adsk.fusion.Design.cast(gm.app.activeProduct)
-        preSelectedOcc = adsk.fusion.Occurrence.cast(args.selection.entity)
-        preSelectedJoint = adsk.fusion.Joint.cast(args.selection.entity)
+    def notify(self, _: adsk.core.SelectionEventArgs) -> None:
+        self.cmd.setCursor("", 0, 0)  # Reset mouse icon to default
 
-        onSelect = gm.handlers[3]  # select handler
 
-        if (not preSelectedOcc and not preSelectedJoint) or not design:
-            self.cmd.setCursor("", 0, 0)
-            return
-
-        preSelected = preSelectedOcc if preSelectedOcc else preSelectedJoint
-        if not preSelected:
-            self.cmd.setCursor("", 0, 0)
-
-
-class MyPreselectEndHandler(adsk.core.SelectionEventHandler):
-    def __init__(self, cmd: adsk.core.Command) -> None:
-        super().__init__()
-        self.cmd = cmd
+class ConfigureCommandInputChanged(PersistentEventHandler, adsk.core.InputChangedEventHandler):
+    """Called when an input field in the configuration panel has been updated."""
 
     @logFailure(messageBox=True)
-    def notify(self, args: adsk.core.SelectionEventArgs) -> None:
-        design = adsk.fusion.Design.cast(gm.app.activeProduct)
-        preSelectedOcc = adsk.fusion.Occurrence.cast(args.selection.entity)
-        preSelectedJoint = adsk.fusion.Joint.cast(args.selection.entity)
-
-        if (preSelectedOcc or preSelectedJoint) and design:
-            self.cmd.setCursor("", 0, 0)  # if preselection ends (mouse off of design), reset the mouse icon to default
-
-
-class ConfigureCommandInputChanged(adsk.core.InputChangedEventHandler):
-    def __init__(self, cmd: adsk.core.Command) -> None:
-        super().__init__()
-        self.cmd = cmd
-
-    @logFailure
-    def reset(self) -> None:
-        self.cmd.setCursor("", 0, 0)
-        gm.ui.activeSelections.clear()
-
     def notify(self, args: adsk.core.InputChangedEventArgs) -> None:
         if generalConfigTab.isActive:
             generalConfigTab.handleInputChanged(args)
@@ -378,11 +219,14 @@ def notify(self, args: adsk.core.InputChangedEventArgs) -> None:
             gamepieceConfigTab.handleInputChanged(args, INPUTS_ROOT)
 
 
-class MyCommandDestroyHandler(adsk.core.CommandEventHandler):
+class MyCommandDestroyHandler(PersistentEventHandler, adsk.core.CommandEventHandler):
+    """Called when the configuration panel is destroyed."""
+
     @logFailure(messageBox=True)
     def notify(self, _: adsk.core.CommandEventArgs) -> None:
         jointConfigTab.reset()
         gamepieceConfigTab.reset()
 
-        for group in gm.app.activeDocument.design.rootComponent.customGraphicsGroups:
+        design = adsk.fusion.Design.cast(adsk.core.Application.get().activeProduct)
+        for group in design.rootComponent.customGraphicsGroups:
             group.deleteMe()
diff --git a/exporter/SynthesisFusionAddin/src/UI/GamepieceConfigTab.py b/exporter/SynthesisFusionAddin/src/UI/GamepieceConfigTab.py
index c28f6c60f1..16aab484f5 100644
--- a/exporter/SynthesisFusionAddin/src/UI/GamepieceConfigTab.py
+++ b/exporter/SynthesisFusionAddin/src/UI/GamepieceConfigTab.py
@@ -273,7 +273,7 @@ def handleInputChanged(
     @logFailure
     def handleSelectionEvent(self, args: adsk.core.SelectionEventArgs, selectedOcc: adsk.fusion.Occurrence) -> None:
         selectionInput = args.activeInput
-        rootComponent = adsk.core.Application.get().activeDocument.design.rootComponent
+        rootComponent = adsk.fusion.Design.cast(adsk.core.Application.get().activeProduct).rootComponent
         occurrenceList: list[adsk.fusion.Occurrence] = rootComponent.allOccurrencesByComponent(selectedOcc.component)
         for occ in occurrenceList:
             if not self.addGamepiece(occ):
diff --git a/exporter/SynthesisFusionAddin/src/UI/Handlers.py b/exporter/SynthesisFusionAddin/src/UI/Handlers.py
index b3f11f516d..2f838f196b 100644
--- a/exporter/SynthesisFusionAddin/src/UI/Handlers.py
+++ b/exporter/SynthesisFusionAddin/src/UI/Handlers.py
@@ -2,6 +2,18 @@
 
 import adsk.core
 
+from src import gm
+
+
+class PersistentEventHandler:
+    """Auto adds itself to the global handler list on creation."""
+
+    # Inherit order matters here, `PersistentEventHandler` should come first
+    # ex: class HButtonCommandCreatedEvent(PersistentEventHandler, adsk.core.CommandCreatedEventHandler)
+    def __init__(self) -> None:
+        super().__init__()
+        gm.handlers.append(self)
+
 
 class HButtonCommandCreatedEvent(adsk.core.CommandCreatedEventHandler):
     """## Abstraction of CreatedEvent as its mostly useless in this context
diff --git a/exporter/SynthesisFusionAddin/src/UI/JointConfigTab.py b/exporter/SynthesisFusionAddin/src/UI/JointConfigTab.py
index 217d409329..bf9badb322 100644
--- a/exporter/SynthesisFusionAddin/src/UI/JointConfigTab.py
+++ b/exporter/SynthesisFusionAddin/src/UI/JointConfigTab.py
@@ -2,7 +2,14 @@
 import adsk.fusion
 
 from src.Logging import logFailure
-from src.Types import Joint, JointParentType, SignalType, Wheel, WheelType
+from src.Types import (
+    SELECTABLE_JOINT_TYPES,
+    Joint,
+    JointParentType,
+    SignalType,
+    Wheel,
+    WheelType,
+)
 from src.UI import IconPaths
 from src.UI.CreateCommandInputsHelper import (
     createBooleanInput,
@@ -479,20 +486,24 @@ def handleInputChanged(
     def handleSelectionEvent(self, args: adsk.core.SelectionEventArgs, selectedJoint: adsk.fusion.Joint) -> None:
         selectionInput = args.activeInput
         jointType = selectedJoint.jointMotion.jointType
-        if jointType == adsk.fusion.JointTypes.RevoluteJointType or jointType == adsk.fusion.JointTypes.SliderJointType:
-            if not self.addJoint(selectedJoint):
-                ui = adsk.core.Application.get().userInterface
-                result = ui.messageBox(
-                    "You have already selected this joint.\n" "Would you like to remove it?",
-                    "Synthesis: Remove Joint Confirmation",
-                    adsk.core.MessageBoxButtonTypes.YesNoButtonType,
-                    adsk.core.MessageBoxIconTypes.QuestionIconType,
-                )
+        if not jointType in SELECTABLE_JOINT_TYPES:
+            ui = adsk.core.Application.get().userInterface
+            ui.messageBox("The selected joint is not currently supported by Synthesis.")
+            return
+
+        if not self.addJoint(selectedJoint):
+            ui = adsk.core.Application.get().userInterface
+            result = ui.messageBox(
+                "You have already selected this joint.\n" "Would you like to remove it?",
+                "Synthesis: Remove Joint Confirmation",
+                adsk.core.MessageBoxButtonTypes.YesNoButtonType,
+                adsk.core.MessageBoxIconTypes.QuestionIconType,
+            )
 
-                if result == adsk.core.DialogResults.DialogYes:
-                    self.removeJoint(selectedJoint)
+            if result == adsk.core.DialogResults.DialogYes:
+                self.removeJoint(selectedJoint)
 
-            selectionInput.isEnabled = selectionInput.isVisible = False
+        selectionInput.isEnabled = selectionInput.isVisible = False
 
     @logFailure
     def handlePreviewEvent(self, args: adsk.core.CommandEventArgs) -> None:
