diff --git a/Assembly-CSharp-Editor.csproj.DotSettings b/Assembly-CSharp-Editor.csproj.DotSettings
index 12ac1b1..38dfe0a 100644
--- a/Assembly-CSharp-Editor.csproj.DotSettings
+++ b/Assembly-CSharp-Editor.csproj.DotSettings
@@ -1,4 +1,8 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cdialoguesystem_005Ceditor/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cdialoguesystem_005Cscripts/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cdialoguesystem_005Cscripts_005Cassetcreators_005Ceditor/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cdialoguesystem_005Cscripts_005Ccharacters_005Ceditor/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cdialoguesystem_005Cscripts_005Cdeleteme_005Ceditor/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cdialoguesystem_005Cscripts_005Cdialogues_005Cnodes_005Ceditor/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cdialoguesystem_005Cscripts_005Ceditor/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Demo/SampleScene.unity b/Assets/DialogueSystem/Demo/SampleScene.unity
index 3355275..1c4fd85 100644
--- a/Assets/DialogueSystem/Demo/SampleScene.unity
+++ b/Assets/DialogueSystem/Demo/SampleScene.unity
@@ -38,13 +38,13 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 705507994}
-  m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.574817, a: 1}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 11
-  m_GIWorkflowMode: 0
+  m_GIWorkflowMode: 1
   m_GISettings:
     serializedVersion: 2
     m_BounceScale: 1
@@ -294,20 +294,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 922203892}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 8786771133028197972}
-        m_MethodName: PlayDialogue
-        m_Mode: 2
-        m_Arguments:
-          m_ObjectArgument: {fileID: 11400000, guid: dd801a633ca8cda42b8ae8d25e17e64a,
-            type: 2}
-          m_ObjectArgumentAssemblyTypeName: lastmilegames.DialogueSystem.DialogueContainer,
-            Assembly-CSharp
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
 --- !u!114 &922203892
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -741,7 +728,7 @@ PrefabInstance:
     - target: {fileID: 8786771132893712695, guid: 4d8914cb6b33dc34e86ba2b8caea414c,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0.000018605962
+      value: -0.00007994529
       objectReference: {fileID: 0}
     - target: {fileID: 8786771132936344443, guid: 4d8914cb6b33dc34e86ba2b8caea414c,
         type: 3}
@@ -751,7 +738,7 @@ PrefabInstance:
     - target: {fileID: 8786771132936344443, guid: 4d8914cb6b33dc34e86ba2b8caea414c,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.00009074141
+      value: -0.000049769158
       objectReference: {fileID: 0}
     - target: {fileID: 8786771132947378257, guid: 4d8914cb6b33dc34e86ba2b8caea414c,
         type: 3}
@@ -1023,17 +1010,6 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 7560019262726077265, guid: 4d8914cb6b33dc34e86ba2b8caea414c, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: 4d8914cb6b33dc34e86ba2b8caea414c, type: 3}
---- !u!114 &8786771133028197972 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 7560019262726077265, guid: 4d8914cb6b33dc34e86ba2b8caea414c,
-    type: 3}
-  m_PrefabInstance: {fileID: 8786771133028197971}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 661418d3488d423caf0369b884804cd9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor.meta b/Assets/DialogueSystem/Images.meta
similarity index 77%
rename from Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor.meta
rename to Assets/DialogueSystem/Images.meta
index 03cfd6e..2e3eaaa 100644
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor.meta
+++ b/Assets/DialogueSystem/Images.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c05fd86c27504e46b184e91f7f07d7ca
+guid: f98a35686ea618d42be5ba2ab81f41d5
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes.meta b/Assets/DialogueSystem/Images/GameIcons.meta
similarity index 77%
rename from Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes.meta
rename to Assets/DialogueSystem/Images/GameIcons.meta
index ba83f90..23d7211 100644
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes.meta
+++ b/Assets/DialogueSystem/Images/GameIcons.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b083094664f84e65805d8cd8f8d1f0c7
+guid: 3d6eb8f53eb3ceb4998df810778a713e
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/DialogueSystem/Images/GameIcons/Attributions.md b/Assets/DialogueSystem/Images/GameIcons/Attributions.md
new file mode 100644
index 0000000..113af6a
--- /dev/null
+++ b/Assets/DialogueSystem/Images/GameIcons/Attributions.md
@@ -0,0 +1 @@
+"Hazard sign icon" (hazard-sign.png) by (Lorc)[https://lorcblog.blogspot.com/] under CC BY 3.0
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Images/GameIcons/Attributions.md.meta b/Assets/DialogueSystem/Images/GameIcons/Attributions.md.meta
new file mode 100644
index 0000000..82e38f0
--- /dev/null
+++ b/Assets/DialogueSystem/Images/GameIcons/Attributions.md.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a5aaf5a67104a5a49952250f1dc756c7
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/DialogueSystem/Images/GameIcons/hazard-sign.png b/Assets/DialogueSystem/Images/GameIcons/hazard-sign.png
new file mode 100644
index 0000000..a736b18
Binary files /dev/null and b/Assets/DialogueSystem/Images/GameIcons/hazard-sign.png differ
diff --git a/Assets/DialogueSystem/Images/GameIcons/hazard-sign.png.meta b/Assets/DialogueSystem/Images/GameIcons/hazard-sign.png.meta
new file mode 100644
index 0000000..7bab909
--- /dev/null
+++ b/Assets/DialogueSystem/Images/GameIcons/hazard-sign.png.meta
@@ -0,0 +1,116 @@
+fileFormatVersion: 2
+guid: 31c96553f1619ae429459f237e6aad5b
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/DialogueSystem/Scripts/Characters.meta b/Assets/DialogueSystem/Scripts/Characters.meta
new file mode 100644
index 0000000..47fe125
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Characters.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: eec5443e206c479aa625452e0d66e7e1
+timeCreated: 1607017854
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Characters/Character.cs b/Assets/DialogueSystem/Scripts/Characters/Character.cs
new file mode 100644
index 0000000..e295b86
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Characters/Character.cs
@@ -0,0 +1,57 @@
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace lastmilegames.DialogueSystem.Characters
+{
+    [CreateAssetMenu(fileName = "New Character", menuName = "Dialogue System/New Character", order = 0)]
+    public class Character : ScriptableObject
+    {
+        [SerializeField] private List<CharacterSprite> characterSprites = new List<CharacterSprite>();
+
+        public IEnumerable<CharacterSprite> GetCharacterSprites()
+        {
+            return characterSprites;
+        }
+
+        public void AddSprite(CharacterSprite cSprite)
+        {
+            characterSprites.Add(cSprite);
+            AssetDatabase.AddObjectToAsset(cSprite, this);
+            AssetDatabase.SaveAssets();
+            AssetDatabase.Refresh();
+        }
+
+        public void RemoveSprite(CharacterSprite cSprite)
+        {
+            AssetDatabase.RemoveObjectFromAsset(cSprite);
+            characterSprites.Remove(cSprite);
+            AssetDatabase.SaveAssets();
+            AssetDatabase.Refresh();
+        }
+
+        public void RemoveAllSprites()
+        {
+            for (int i = characterSprites.Count - 1; i >= 0; i--)
+            {
+                AssetDatabase.RemoveObjectFromAsset(characterSprites[i]);
+                characterSprites.RemoveAt(i);
+            }
+
+            AssetDatabase.SaveAssets();
+            AssetDatabase.Refresh();
+        }
+
+        public void RenameSubAsset(CharacterSprite cSprite)
+        {
+            // Remove the old object
+            AssetDatabase.RemoveObjectFromAsset(cSprite);
+            AssetDatabase.SaveAssets();
+
+            // Add the new object
+            AssetDatabase.AddObjectToAsset(cSprite, this);
+            AssetDatabase.SaveAssets();
+            AssetDatabase.Refresh();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Characters/Character.cs.meta b/Assets/DialogueSystem/Scripts/Characters/Character.cs.meta
new file mode 100644
index 0000000..362291b
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Characters/Character.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 27075574afdb479fb0694373243e6c78
+timeCreated: 1606948476
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Characters/CharacterSprite.cs b/Assets/DialogueSystem/Scripts/Characters/CharacterSprite.cs
new file mode 100644
index 0000000..f4dbea4
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Characters/CharacterSprite.cs
@@ -0,0 +1,9 @@
+using UnityEngine;
+
+namespace lastmilegames.DialogueSystem.Characters
+{
+    public class CharacterSprite : ScriptableObject
+    {
+        public Sprite sprite;
+    }
+}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Characters/CharacterSprite.cs.meta b/Assets/DialogueSystem/Scripts/Characters/CharacterSprite.cs.meta
new file mode 100644
index 0000000..005d62c
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Characters/CharacterSprite.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 20a78fb41e41499188727b72bb6a083d
+timeCreated: 1607017880
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Characters/Editor.meta b/Assets/DialogueSystem/Scripts/Characters/Editor.meta
new file mode 100644
index 0000000..7edec87
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Characters/Editor.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 378ce32d46c641e2abcfd4f77f00274b
+timeCreated: 1607120834
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterEditor.cs b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterEditor.cs
new file mode 100644
index 0000000..ae9752e
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterEditor.cs
@@ -0,0 +1,124 @@
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace lastmilegames.DialogueSystem.Characters
+{
+    [CustomEditor(typeof(Character))]
+    public class CharacterEditor : Editor
+    {
+        private Character character;
+        private VisualElement cSpriteList;
+        private VisualElement rootElement;
+
+        private void OnEnable()
+        {
+            rootElement = new VisualElement();
+            character = (Character) target;
+
+            var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(
+                "Assets/DialogueSystem/Scripts/AssetCreators/Editor/CharacterEditor.uxml");
+            visualTree.CloneTree(rootElement);
+
+            var styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>(
+                "Assets/DialogueSystem/Scripts/AssetCreators/Editor/CharacterEditor.uss");
+            rootElement.styleSheets.Add(styleSheet);
+        }
+
+        public override VisualElement CreateInspectorGUI()
+        {
+            #region Fields
+
+            var characterName = rootElement.Q<TextField>("characterName");
+            characterName.isDelayed = true;
+            characterName.value = character.name;
+            characterName.RegisterCallback<ChangeEvent<string>>(evt =>
+            {
+                character.name = evt.newValue;
+                Utilities.RenameAsset(character, evt.newValue);
+
+
+                EditorUtility.SetDirty(character);
+            });
+
+            #endregion
+
+            #region Diaplay Sprite List
+
+            cSpriteList = rootElement.Q<VisualElement>("spriteList");
+            UpdateSpriteList();
+
+            #endregion
+
+            #region Buttons
+
+            var btnAddSprite = rootElement.Q<Button>("btnAddSprite");
+            btnAddSprite.clickable.clicked += AddCharacterSprite;
+
+            var btnRemoveAll = rootElement.Q<Button>("btnRemoveAll");
+            btnRemoveAll.clickable.clicked += RemoveAllSprites;
+
+            #endregion
+
+            return rootElement;
+        }
+
+        public void RemoveCSprite(CharacterSprite cSprite)
+        {
+            character.RemoveSprite(cSprite);
+            UpdateSpriteList();
+        }
+
+        private void RemoveAllSprites()
+        {
+            if (!EditorUtility.DisplayDialog(
+                "Delete All Sprite",
+                "Are you sure you want to delete all sprites for this character?",
+                "Delete All", "Cancel"))
+                return;
+
+            character.RemoveAllSprites();
+            UpdateSpriteList();
+        }
+
+        private void AddCharacterSprite()
+        {
+            var cSprite = CreateInstance<CharacterSprite>();
+            cSprite.name = "New Sprite";
+            character.AddSprite(cSprite);
+            UpdateSpriteList();
+        }
+
+        private void UpdateSpriteList()
+        {
+            cSpriteList.Clear();
+            if (!character.GetCharacterSprites().Any())
+            {
+                var infoBox = new Box();
+                infoBox.Add(new Label
+                {
+                    text = "No sprites found.",
+                    style =
+                    {
+                        paddingTop = 10, paddingRight = 20, paddingBottom = 10, paddingLeft = 20,
+                        unityTextAlign = TextAnchor.MiddleCenter
+                    }
+                });
+                cSpriteList.Add(infoBox);
+            }
+
+            foreach (CharacterSprite cSprite in character.GetCharacterSprites())
+            {
+                var element = new CharacterSpriteElement(this, cSprite);
+                cSpriteList.Add(element);
+                element.Q<TextField>("spriteName").Focus();
+            }
+        }
+
+        public void UpdateSubAssetName(CharacterSprite cSprite)
+        {
+            character.RenameSubAsset(cSprite);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/BaseNode.cs.meta b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterEditor.cs.meta
similarity index 83%
rename from Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/BaseNode.cs.meta
rename to Assets/DialogueSystem/Scripts/Characters/Editor/CharacterEditor.cs.meta
index a01926a..c5b6571 100644
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/BaseNode.cs.meta
+++ b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterEditor.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9f3a83de00de477dac54fffe0f3c08d6
+guid: f5b488994fb246258e6d002bbc142ce0
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterEditor.uss b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterEditor.uss
new file mode 100644
index 0000000..e57dd43
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterEditor.uss
@@ -0,0 +1,35 @@
+.container {
+    margin-bottom: 5px;
+    padding: 5px;
+}
+
+.heading {
+    margin-bottom: 5px;
+    font-size: 24px;
+    -unity-font-style: bold;
+}
+
+Label.subheading,
+Foldout.subheading > Toggle .unity-label {
+    border-bottom-width: 1px;
+    border-bottom-color: #909090;
+    margin: 10px 0;
+    padding-bottom: 5px;
+    -unity-font-style: italic;
+    width: 100%;
+}
+
+Foldout.subheading .unity-toggle__checkmark {
+    margin-top: 12px;
+}
+
+.buttonRow {
+    display: flex;
+    flex-direction: row;
+    align-items: stretch;
+    margin-bottom: 10px;
+}
+
+.buttonRow Button {
+    flex-grow: 1;
+}
diff --git a/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterEditor.uss.meta b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterEditor.uss.meta
new file mode 100644
index 0000000..01f7ce7
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterEditor.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 78ee0b3af995add4796e9bf28af29d07
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterEditor.uxml b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterEditor.uxml
new file mode 100644
index 0000000..07b3fe3
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterEditor.uxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<engine:UXML
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns:engine="UnityEngine.UIElements"
+        xsi:noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd"
+>
+    <!-- Character -->
+    <engine:Label text="Dialogue Character" class="heading"/>
+    <engine:VisualElement class="container">
+        <engine:Label text="General Config" class="subheading"/>
+        <engine:TextField name="characterName" label="Character Name"/>
+    </engine:VisualElement>
+
+    <!-- Character Sprites -->
+    <engine:VisualElement class="container">
+        <engine:Foldout class="subheading" text="Character Sprites">
+            <engine:VisualElement class="buttonRow">
+                <engine:Button name="btnAddSprite" text="Add Sprite"/>
+                <engine:Button name="btnRemoveAll" text="Remove All"/>
+            </engine:VisualElement>
+            <engine:VisualElement name="spriteList"/>
+        </engine:Foldout>
+    </engine:VisualElement>
+</engine:UXML>
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterEditor.uxml.meta b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterEditor.uxml.meta
new file mode 100644
index 0000000..48eeb7d
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterEditor.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: bdd4fb96ea5f34a42b3f56ecd1fc9b42
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterSpriteElement.cs b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterSpriteElement.cs
new file mode 100644
index 0000000..7e314dc
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterSpriteElement.cs
@@ -0,0 +1,63 @@
+using UnityEditor;
+using UnityEditor.UIElements;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace lastmilegames.DialogueSystem.Characters
+{
+    public class CharacterSpriteElement : VisualElement
+    {
+        private readonly CharacterEditor characterEditor;
+        private readonly CharacterSprite characterSprite;
+
+        public CharacterSpriteElement(CharacterEditor characterEditor, CharacterSprite characterSprite)
+        {
+            this.characterEditor = characterEditor;
+            this.characterSprite = characterSprite;
+
+            var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(
+                "Assets/DialogueSystem/Scripts/AssetCreators/Editor/CharacterSpriteElement.uxml");
+            visualTree.CloneTree(this);
+
+            var styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>(
+                "Assets/DialogueSystem/Scripts/AssetCreators/Editor/CharacterSpriteElement.uss");
+            styleSheets.Add(styleSheet);
+            AddToClassList("characterSprite");
+
+            #region Fields
+
+            var spriteNameField = this.Q<TextField>("spriteName");
+            spriteNameField.isDelayed = true;
+            spriteNameField.value = characterSprite.name;
+            spriteNameField.RegisterCallback<ChangeEvent<string>>(evt =>
+            {
+                characterSprite.name = evt.newValue;
+                characterEditor.UpdateSubAssetName(characterSprite);
+                EditorUtility.SetDirty(characterSprite);
+            });
+
+            var spriteDisplay = this.Q<VisualElement>("spriteDisplay");
+            spriteDisplay.style.backgroundImage = characterSprite.sprite ? characterSprite.sprite.texture : null;
+
+            var spriteField = this.Q<ObjectField>("sprite");
+            spriteField.objectType = typeof(Sprite);
+            spriteField.value = characterSprite.sprite;
+            spriteField.RegisterCallback<ChangeEvent<Object>>(evt =>
+            {
+                characterSprite.sprite = (Sprite) evt.newValue;
+                spriteDisplay.style.backgroundImage = characterSprite.sprite.texture;
+                EditorUtility.SetDirty(characterSprite);
+            });
+
+            var btnRemoveCSprite = this.Q<Button>("btnRemoveCSprite");
+            btnRemoveCSprite.clickable.clicked += RemoveSprite;
+
+            #endregion
+        }
+
+        private void RemoveSprite()
+        {
+            characterEditor.RemoveCSprite(characterSprite);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/DialogueCondition.cs.meta b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterSpriteElement.cs.meta
similarity index 83%
rename from Assets/DialogueSystem/Scripts/DialogueCondition.cs.meta
rename to Assets/DialogueSystem/Scripts/Characters/Editor/CharacterSpriteElement.cs.meta
index 28f5335..7242537 100644
--- a/Assets/DialogueSystem/Scripts/DialogueCondition.cs.meta
+++ b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterSpriteElement.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 05d1c53c2c64b3a4f92f88b39401c7e6
+guid: d994ffdf2f06c9a4384602dd281cf192
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterSpriteElement.uss b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterSpriteElement.uss
new file mode 100644
index 0000000..c86d418
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterSpriteElement.uss
@@ -0,0 +1,48 @@
+.spriteRow {
+    border-width: 2px;
+    border-color: black;
+    border-radius: 5px;
+    display: flex;
+    flex-direction: row;
+    margin-bottom: 10px;
+    padding: 5px;
+}
+
+.spriteContainer {
+    width: 60px;
+    height: 60px;
+}
+
+.spriteImage {
+    position: absolute;
+    -unity-background-scale-mode: scale-and-crop;
+    margin: 5px;
+    width: 50px;
+    height: 50px;
+}
+
+.spriteBackground {
+    position: absolute;
+    border-width: 1px;
+    border-color: #000;
+    width: 55px;
+    height: 55px;
+}
+
+.fieldContainer {
+    flex-grow: 1;
+}
+
+.spriteField {
+    display: flex;
+    flex-direction: row;
+}
+
+.spriteField .unity-label {
+    min-width: 75px;
+    max-width: 150px;
+}
+
+.spriteField .unity-base-field__input {
+    flex-grow: 1;
+}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterSpriteElement.uss.meta b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterSpriteElement.uss.meta
new file mode 100644
index 0000000..049a2d9
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterSpriteElement.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7c4621a6dc4bcb045b2bb275bfe4abe2
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterSpriteElement.uxml b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterSpriteElement.uxml
new file mode 100644
index 0000000..1fe6c8d
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterSpriteElement.uxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<engine:UXML
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns:engine="UnityEngine.UIElements"
+        xmlns:editor="UnityEditor.UIElements"
+        xsi:noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd"
+>
+    <engine:VisualElement class="conatiner">
+        <engine:VisualElement class="spriteRow">
+            <engine:VisualElement class="previewContainer">
+                <engine:Label text="Preview"/>
+                <engine:VisualElement class="spriteContainer">
+                    <engine:VisualElement class="spriteBackground"/>
+                    <engine:VisualElement name="spriteDisplay" class="spriteImage"/>
+                </engine:VisualElement>
+            </engine:VisualElement>
+            <engine:VisualElement class="fieldContainer">
+                <engine:TextField name="spriteName" class="spriteField" label="Sprite ID"/>
+                <editor:ObjectField name="sprite" class="spriteField" label="Sprite"/>
+                <engine:Button name="btnRemoveCSprite" text="Remove Sprite"/>
+            </engine:VisualElement>
+        </engine:VisualElement>
+    </engine:VisualElement>
+</engine:UXML>
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterSpriteElement.uxml.meta b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterSpriteElement.uxml.meta
new file mode 100644
index 0000000..daa5f87
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Characters/Editor/CharacterSpriteElement.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 26b57207b6a2c2c4dbe7c82918b992e0
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/DialogueSystem/Scripts/Characters/Editor/Utilities.cs b/Assets/DialogueSystem/Scripts/Characters/Editor/Utilities.cs
new file mode 100644
index 0000000..a99671d
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Characters/Editor/Utilities.cs
@@ -0,0 +1,30 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace lastmilegames.DialogueSystem.Characters
+{
+    public static class Utilities
+    {
+        public static void RenameAsset(Object asset, string newName)
+        {
+            if (!EditorUtility.DisplayDialog(
+                "Rename Character",
+                "Do you want to change the asset name to match the new character name?",
+                "Rename Asset", "Cancel"))
+            {
+                return;
+            }
+
+            string currentPath = AssetDatabase.GetAssetPath(asset);
+
+            string error = AssetDatabase.RenameAsset(currentPath, newName);
+            if (!string.IsNullOrEmpty(error))
+            {
+                Debug.LogError(error);
+            }
+
+            AssetDatabase.SaveAssets();
+            AssetDatabase.Refresh();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Characters/Editor/Utilities.cs.meta b/Assets/DialogueSystem/Scripts/Characters/Editor/Utilities.cs.meta
new file mode 100644
index 0000000..d8c5a7d
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Characters/Editor/Utilities.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 600feaf93b2f44c9af2d727c164025e9
+timeCreated: 1607043494
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Conditions.meta b/Assets/DialogueSystem/Scripts/Conditions.meta
new file mode 100644
index 0000000..6c247f2
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Conditions.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e271617a728440578eb17ec78689f751
+timeCreated: 1607382567
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Conditions/Condition.cs b/Assets/DialogueSystem/Scripts/Conditions/Condition.cs
new file mode 100644
index 0000000..179aaeb
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Conditions/Condition.cs
@@ -0,0 +1,32 @@
+using UnityEngine;
+
+namespace lastmilegames.DialogueSystem.Conditions
+{
+    [CreateAssetMenu(fileName = "New Condition", menuName = "Dialogue System/New Condition", order = 0)]
+    public class Condition : ScriptableObject
+    {
+        // ReSharper disable RedundantDefaultMemberInitializer
+        [SerializeField] private bool initialValue = false;
+        // ReSharper restore RedundantDefaultMemberInitializer
+
+#if UNITY_EDITOR
+        public string developerNotes = "";
+#endif
+        public bool InitialValue => initialValue;
+
+        public void ToggleValue()
+        {
+            initialValue = !initialValue;
+        }
+
+        public void SetValue(bool newValue)
+        {
+            initialValue = newValue;
+        }
+
+        public void SetValue(Condition newValue)
+        {
+            initialValue = newValue.initialValue;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Conditions/Condition.cs.meta b/Assets/DialogueSystem/Scripts/Conditions/Condition.cs.meta
new file mode 100644
index 0000000..e91a60c
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Conditions/Condition.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3288dffd262240578fdb932c50047783
+timeCreated: 1607382567
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/DialogueCondition.cs b/Assets/DialogueSystem/Scripts/DialogueCondition.cs
deleted file mode 100644
index 38b7c5e..0000000
--- a/Assets/DialogueSystem/Scripts/DialogueCondition.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using UnityEngine;
-
-namespace lastmilegames.DialogueSystem
-{
-    /// <summary>
-    /// A serializable bool that con be used to branch dialogue.
-    /// </summary>
-    [CreateAssetMenu(fileName = "Condition", menuName = "Dialogue System/New Condition", order = 0)]
-    public class DialogueCondition : ScriptableObject
-    {
-        /// <summary>
-        /// The value of the condition.
-        /// </summary>
-        /// <remarks>Is automatically set by OnEnable so that value can be changed in play mode without persisting to the object.</remarks>
-        public bool Value { get; private set; }
-        /// <summary>
-        /// The initial value of the
-        /// </summary>
-        // ReSharper disable once RedundantDefaultMemberInitializer
-        [SerializeField] private bool initialValue = false;
-        
-        private void OnEnable()
-        {
-            Value = initialValue;
-        }
-
-        /// <summary>
-        /// Toggle the runtime value of the condition without affecting the initial value.
-        /// </summary>
-        public void ToggleValue()
-        {
-            Value = !Value;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/DialogueContainer.cs b/Assets/DialogueSystem/Scripts/DialogueContainer.cs
deleted file mode 100644
index f914cfe..0000000
--- a/Assets/DialogueSystem/Scripts/DialogueContainer.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using lastmilegames.DialogueSystem.NodeData;
-using UnityEditor;
-using UnityEngine;
-
-namespace lastmilegames.DialogueSystem
-{
-    /// <summary>
-    /// Represents a conversation dialogue.
-    /// </summary>
-    [CreateAssetMenu(fileName = "DialogueContainer", menuName = "Dialogue System/New Container", order = 0)]
-    public class DialogueContainer : ScriptableObject
-    {
-        /// <summary>
-        /// The entry node for the conversation.
-        /// </summary>
-        public BaseNodeData entryNode = new BaseNodeData
-        {
-            guid = Guid.NewGuid().ToString(),
-            position = new Vector2(100, 200),
-            type = NodeType.Entry
-        };
-
-        /// <summary>
-        /// A list of the links between nodes.
-        /// </summary>
-        public List<NodeLinkData> nodeLinkData = new List<NodeLinkData>();
-        
-        /// <summary>
-        /// A list of dialogues which contain who is speaking, what they're saying, and available responses.
-        /// </summary>
-        public List<DialogueNodeData> dialogueNodeData = new List<DialogueNodeData>();
-        
-        /// <summary>
-        /// A list of conditions that can alter the flow of the conversation.
-        /// </summary>
-        public List<ConditionNodeData> conditionNodeData = new List<ConditionNodeData>();
-
-        /// <summary>
-        /// A list of exposed properties that can be used to dynamically update dialogue text.
-        /// </summary>
-        public List<ExposedProperty> exposedProperties = new List<ExposedProperty>();
-    }
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/DialogueContainer.cs.meta b/Assets/DialogueSystem/Scripts/DialogueContainer.cs.meta
deleted file mode 100644
index 16d9913..0000000
--- a/Assets/DialogueSystem/Scripts/DialogueContainer.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: a08108e497d646b08215f88b69e361f0
-timeCreated: 1582678137
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/DialoguePlayer.cs b/Assets/DialogueSystem/Scripts/DialoguePlayer.cs
deleted file mode 100644
index 83f999b..0000000
--- a/Assets/DialogueSystem/Scripts/DialoguePlayer.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using lastmilegames.DialogueSystem.NodeData;
-using TMPro;
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace lastmilegames.DialogueSystem
-{
-    public class DialoguePlayer : MonoBehaviour, IDialoguePlayer
-    {
-        // ReSharper disable RedundantDefaultMemberInitializer
-        [SerializeField] private Transform dialoguePanel = default;
-        [SerializeField] private TMP_Text speakerNameLabel = default;
-        [SerializeField] private TMP_Text dialogueLabel = default;
-        [SerializeField] private Transform choicesContentAreaTransform = default;
-        [SerializeField] private Button choiceButtonPrefab = default;
-
-        [SerializeField] private string closeConversationLabelText = "[End Conversation]";
-        // ReSharper restore RedundantDefaultMemberInitializer
-
-        private DialogueContainer dialogueContainer;
-
-        private void Awake()
-        {
-            dialoguePanel.gameObject.SetActive(false);
-        }
-
-        public void PlayDialogue(DialogueContainer container)
-        {
-            if (container == null)
-            {
-                Debug.LogError("No dialogue provided by trigger. Aborting conversation.");
-                return;
-            }
-
-            dialogueContainer = container;
-
-            BaseNodeData startingNode = GetTargetNode(dialogueContainer.nodeLinkData.Find(data =>
-                data.baseNodeGuid == dialogueContainer.entryNode.guid));
-
-            PlayNode(startingNode);
-            dialoguePanel.gameObject.SetActive(true);
-        }
-
-        private BaseNodeData GetTargetNode(NodeLinkData nodeLink)
-        {
-            switch (nodeLink.targetNodeType)
-            {
-                case NodeType.NotSet:
-                    return null;
-                case NodeType.Entry:
-                    return null;
-                case NodeType.Condition:
-                    return dialogueContainer.conditionNodeData.Find(
-                        node => node.guid == nodeLink.targetNodeGuid);
-                case NodeType.Dialogue:
-                    return dialogueContainer.dialogueNodeData.Find(node =>
-                        node.guid == nodeLink.targetNodeGuid);
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
-        }
-
-        private void PlayNode(BaseNodeData node)
-        {
-            switch (node.type)
-            {
-                case NodeType.NotSet:
-                    break;
-                case NodeType.Entry:
-                    break;
-                case NodeType.Condition:
-                    EvaluateConditionNode(node as ConditionNodeData);
-                    break;
-                case NodeType.Dialogue:
-                    DisplayDialogueNode(node as DialogueNodeData);
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
-        }
-
-        private void DisplayDialogueNode(DialogueNodeData node)
-        {
-            speakerNameLabel.text = ProcessExposedProperties(node.speakerName);
-            dialogueLabel.text = ProcessExposedProperties(node.dialogueText);
-
-            ClearChoiceButtons();
-            
-            if (node.responses.Count == 0)
-            {
-                Button endButton = Instantiate(choiceButtonPrefab, choicesContentAreaTransform);
-                endButton.GetComponentInChildren<TMP_Text>().text = closeConversationLabelText;
-                endButton.onClick.AddListener(() => dialoguePanel.gameObject.SetActive(false));
-            }
-            else
-            {
-                GenerateChoiceButtons(node);
-            }
-
-        }
-
-        private string ProcessExposedProperties(string nodeDialogueText)
-        {
-            string processedText = nodeDialogueText;
-
-            foreach (ExposedProperty property in dialogueContainer.exposedProperties)
-            {
-                processedText = processedText.Replace(property.propertyName, property.propertyValue);
-            }
-
-            return processedText;
-        }
-
-        private void ClearChoiceButtons()
-        {
-            foreach (Transform child in choicesContentAreaTransform)
-            {
-                Destroy(child.gameObject);
-            }
-        }
-
-        private void GenerateChoiceButtons(DialogueNodeData node)
-        {
-            List<NodeLinkData> nodeLinks = GetLinks(node.guid);
-
-            if (nodeLinks.Count != node.responses.Count)
-            {
-                Debug.LogError(
-                    $"Dialogue Node {node.guid} has mismatched number of links and responses. Aborting conversation.");
-                dialoguePanel.gameObject.SetActive(false);
-                return;
-            }
-
-            for (var i = 0; i < node.responses.Count; i++)
-            {
-                NodeLinkData link = nodeLinks[i];
-                string currentResponse = node.responses[i];
-                DialogueCondition conditionToToggle = node.conditionsToToggle[i];
-                Button button = Instantiate(choiceButtonPrefab, choicesContentAreaTransform);
-                button.GetComponentInChildren<TMP_Text>().text = currentResponse;
-                button.onClick.AddListener(() => OnButtonClick(link, conditionToToggle));
-            }
-        }
-
-        private void OnButtonClick(NodeLinkData linkData, DialogueCondition conditionToToggle)
-        {
-            if (conditionToToggle != null) conditionToToggle.ToggleValue();
-            
-            BaseNodeData nextNode = GetTargetNode(linkData);
-            
-            PlayNode(nextNode);
-        }
-
-        private void EvaluateConditionNode(ConditionNodeData node)
-        {
-            List<NodeLinkData> nextNodes = GetLinks(node.guid);
-
-            BaseNodeData nextNode = GetTargetNode(node.conditionToTest.Value ? nextNodes[0] : nextNodes[1]);
-            
-            PlayNode(nextNode);
-        }
-
-        private List<NodeLinkData> GetLinks(string guid)
-        {
-            return dialogueContainer.nodeLinkData.FindAll(link => link.baseNodeGuid == guid);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/DialoguePlayer.cs.meta b/Assets/DialogueSystem/Scripts/DialoguePlayer.cs.meta
deleted file mode 100644
index e83f064..0000000
--- a/Assets/DialogueSystem/Scripts/DialoguePlayer.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 661418d3488d423caf0369b884804cd9
-timeCreated: 1604013598
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues.meta b/Assets/DialogueSystem/Scripts/Dialogues.meta
new file mode 100644
index 0000000..34f86ca
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a4f2d3ac1e7e475c8af9d62d38cce608
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Dialogue.cs b/Assets/DialogueSystem/Scripts/Dialogues/Dialogue.cs
new file mode 100644
index 0000000..5a6038c
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Dialogue.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using lastmilegames.DialogueSystem.Characters;
+using lastmilegames.DialogueSystem.Dialogues.Nodes;
+using UnityEngine;
+
+namespace lastmilegames.DialogueSystem.Dialogues
+{
+    [CreateAssetMenu(fileName = "new Dialogue", menuName = "Dialogue System/New Dialogue", order = 0)]
+    public class Dialogue : ScriptableObject
+    {
+        [SerializeField] private List<Character> characters = new List<Character>();
+        [SerializeField] private List<Node> nodes = new List<Node>();
+
+        private Node currentNode;
+
+        public void ProcessNode(Node node)
+        {
+            switch (node.Type)
+            {
+                case NodeType.None:
+                    Debug.LogWarning($"No node type selected for {node.name}.");
+                    break;
+                case NodeType.Dialogue:
+                    ProcessDialogueNode(node as DialogueNode);
+                    break;
+                case NodeType.Condition:
+                    ProcessConditionNode(node as ConditionNode);
+                    break;
+                case NodeType.Event:
+                    ProcessEventNode(node as TriggerEventNode);
+                    break;
+                case NodeType.JumpToNode:
+                    break;
+                case NodeType.PlayNewDialogue:
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+
+        private void ProcessDialogueNode(DialogueNode node)
+        {
+            throw new NotImplementedException();
+        }
+
+        private void ProcessConditionNode(ConditionNode node)
+        {
+            throw new NotImplementedException();
+        }
+
+        private void ProcessEventNode(TriggerEventNode node)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Dialogue.cs.meta b/Assets/DialogueSystem/Scripts/Dialogues/Dialogue.cs.meta
new file mode 100644
index 0000000..40670fa
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Dialogue.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9bf369f3c8424ad8ad855059664739ab
+timeCreated: 1607120666
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes.meta b/Assets/DialogueSystem/Scripts/Dialogues/Nodes.meta
new file mode 100644
index 0000000..fd132f8
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: aadc15ca5acd4299bea6885d107a3f64
+timeCreated: 1607120945
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/ConditionNode.cs b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/ConditionNode.cs
new file mode 100644
index 0000000..37d4ee2
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/ConditionNode.cs
@@ -0,0 +1,30 @@
+using lastmilegames.DialogueSystem.Conditions;
+using UnityEngine;
+
+namespace lastmilegames.DialogueSystem.Dialogues.Nodes
+{
+    public class ConditionNode : Node
+    {
+        [SerializeField] private NodeFunction nodeFunction = NodeFunction.Get;
+        [SerializeField] private Condition condition = null;
+        public NodeFunction NodeFunction => nodeFunction;
+        public Condition Condition => condition;
+
+        protected override void OnEnable()
+        {
+            type = NodeType.Condition;
+        }
+
+#if UNITY_EDITOR
+        public void SetCondition(Condition newCondition)
+        {
+            condition = newCondition;
+        }
+
+        public void SetFunction(NodeFunction newFunction)
+        {
+            nodeFunction = newFunction;
+        }
+#endif
+    }
+}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/ConditionNode.cs.meta b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/ConditionNode.cs.meta
new file mode 100644
index 0000000..2bd0000
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/ConditionNode.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7ca721f22f5b421cb5149d19d3ea233e
+timeCreated: 1607382389
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/DialogueNode.cs b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/DialogueNode.cs
new file mode 100644
index 0000000..7786305
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/DialogueNode.cs
@@ -0,0 +1,59 @@
+using lastmilegames.DialogueSystem.Characters;
+using UnityEngine;
+
+namespace lastmilegames.DialogueSystem.Dialogues.Nodes
+{
+    public class DialogueNode : Node
+    {
+        protected override void OnEnable()
+        {
+            type = NodeType.Dialogue;
+        }
+
+        /// <summary>
+        /// Gets the dialogue text of the node.
+        /// </summary>
+        /// <returns>Returns the text to display in the UI.</returns>
+        public string GetDialogueText()
+        {
+            return dialogue;
+        }
+
+        /// <summary>
+        /// Gets the "speaker" for the dialogue node.
+        /// </summary>
+        /// <returns>Returns a <code>Character</code> object with the character data.</returns>
+        public Character GetCharacter()
+        {
+            return speaker;
+        }
+
+        // ReSharper disable RedundantDefaultMemberInitializer
+        [SerializeField] private Character speaker = default;
+
+        [SerializeField] private string dialogue = default;
+        // ReSharper restore RedundantDefaultMemberInitializer
+
+#if UNITY_EDITOR
+        /// <summary>
+        /// Updates the speaker for the node.
+        /// </summary>
+        /// <param name="newSpeaker">A DialogueSystem.Character to associate with the dialogue.</param>
+        /// <remarks>Editor only method.</remarks>
+        public void SetSpeaker(Character newSpeaker)
+        {
+            speaker = newSpeaker;
+        }
+
+        /// <summary>
+        /// Update the dialogue text to the new string.
+        /// </summary>
+        /// <param name="text">The new dialogue text.</param>
+        /// <remarks>Editor only method.</remarks>
+        public void SetDialogueText(string text)
+        {
+            dialogue = text;
+        }
+#endif
+    }
+}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/DialogueGraphView.cs.meta b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/DialogueNode.cs.meta
similarity index 83%
rename from Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/DialogueGraphView.cs.meta
rename to Assets/DialogueSystem/Scripts/Dialogues/Nodes/DialogueNode.cs.meta
index 5c23828..061f8af 100644
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/DialogueGraphView.cs.meta
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/DialogueNode.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3e41570acd26438eb5e94c7117048dda
+guid: 35ddb121f2179c84b876898d68e233a1
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor.meta b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor.meta
new file mode 100644
index 0000000..27677ab
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 05f347807a1447b4fab30b8452581b53
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/ConditionNodeEditor.cs b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/ConditionNodeEditor.cs
new file mode 100644
index 0000000..fd32758
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/ConditionNodeEditor.cs
@@ -0,0 +1,51 @@
+using lastmilegames.DialogueSystem.Conditions;
+using lastmilegames.DialogueSystem.Utilities;
+using UnityEditor;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace lastmilegames.DialogueSystem.Dialogues.Nodes
+{
+    [CustomEditor(typeof(ConditionNode))]
+    public class ConditionNodeEditor : NodeEditor
+    {
+        private ConditionNode cNode;
+
+        protected override VisualElement SetupEditorGUI()
+        {
+            cNode = (ConditionNode) node;
+            var elementRoot = new VisualElement();
+            var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(
+                "Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/ConditionNodeEditor.uxml");
+            var styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>(
+                "Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/ConditionNodeEditor.uss");
+            visualTree.CloneTree(elementRoot);
+            elementRoot.styleSheets.Add(styleSheet);
+
+            var boolConditionValueField = elementRoot.Q<Toggle>();
+            boolConditionValueField.value = cNode.Condition && cNode.Condition.InitialValue;
+            boolConditionValueField.RegisterValueChangedCallback(evt =>
+            {
+                cNode.Condition.SetValue(evt.newValue);
+                boolConditionValueField.ToggleFieldVisibility(cNode.Condition != null);
+            });
+            boolConditionValueField.ToggleFieldVisibility(cNode.Condition != null);
+
+            var enumNodeFunctionField = elementRoot.Q<EnumField>("enumNodeFunctionField");
+            enumNodeFunctionField.value = cNode.NodeFunction;
+            enumNodeFunctionField.RegisterValueChangedCallback(evt =>
+                cNode.SetFunction((NodeFunction) evt.newValue));
+
+            var objConditionField = elementRoot.Q<ObjectField>("objConditionField");
+            objConditionField.objectType = typeof(Condition);
+            objConditionField.value = cNode.Condition;
+            objConditionField.RegisterValueChangedCallback(evt =>
+            {
+                cNode.SetCondition((Condition) evt.newValue);
+                boolConditionValueField.ToggleFieldVisibility(cNode.Condition != null);
+            });
+
+            return elementRoot;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/ConditionNodeEditor.cs.meta b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/ConditionNodeEditor.cs.meta
new file mode 100644
index 0000000..14dbe2f
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/ConditionNodeEditor.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f409c80acf80e5f4d8d329c9d96856b6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/ConditionNodeEditor.uss b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/ConditionNodeEditor.uss
new file mode 100644
index 0000000..e69de29
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/ConditionNodeEditor.uss.meta b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/ConditionNodeEditor.uss.meta
new file mode 100644
index 0000000..1781973
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/ConditionNodeEditor.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 74983d9baa291814daafbfd1c3b043d8
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/ConditionNodeEditor.uxml b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/ConditionNodeEditor.uxml
new file mode 100644
index 0000000..e90a350
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/ConditionNodeEditor.uxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<engine:UXML
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns:engine="UnityEngine.UIElements"
+        xmlns:editor="UnityEditor.UIElements"
+        xsi:noNamespaceSchemaLocation="../../../../../../UIElementsSchema/UIElements.xsd"
+>
+    <engine:Label text="Condition Node Options" class="heading"/>
+    <engine:VisualElement class="container">
+        <editor:EnumField name="enumNodeFunctionField" label="Function"/>
+        <editor:ObjectField name="objConditionField" label="Condition"/>
+        <engine:Toggle name="boolConditionValue" label="Initial Value"/>
+    </engine:VisualElement>
+</engine:UXML>
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/ConditionNodeEditor.uxml.meta b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/ConditionNodeEditor.uxml.meta
new file mode 100644
index 0000000..4aeb2ca
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/ConditionNodeEditor.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 19c1448a953ed794ca2045938027a207
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/DialogueNodeEditor.cs b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/DialogueNodeEditor.cs
new file mode 100644
index 0000000..dac2a86
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/DialogueNodeEditor.cs
@@ -0,0 +1,38 @@
+using lastmilegames.DialogueSystem.Characters;
+using UnityEditor;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace lastmilegames.DialogueSystem.Dialogues.Nodes
+{
+    [CustomEditor(typeof(DialogueNode))]
+    public class DialogueNodeEditor : NodeEditor
+    {
+        private DialogueNode dialogueNode;
+
+        protected override VisualElement SetupEditorGUI()
+        {
+            dialogueNode = (DialogueNode) node;
+            var elementRoot = new VisualElement();
+            var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(
+                "Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/DialogueNodeEditor.uxml");
+            visualTree.CloneTree(elementRoot);
+
+            // var styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>(
+            //     "Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/DialogueNodeEditor.uss");
+            // elementRoot.styleSheets.Add(styleSheet);
+
+            var objCharacterField = elementRoot.Q<ObjectField>("objCharacterField");
+            objCharacterField.objectType = typeof(Character);
+            objCharacterField.value = dialogueNode.GetCharacter();
+            objCharacterField.RegisterValueChangedCallback(evt =>
+                dialogueNode.SetSpeaker((Character) evt.newValue));
+
+            var txtDialogue = elementRoot.Q<TextField>("txtDialogue");
+            txtDialogue.value = dialogueNode.GetDialogueText();
+            txtDialogue.RegisterValueChangedCallback(evt => dialogueNode.SetDialogueText(evt.newValue));
+
+            return elementRoot;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/DialogueNodeEditor.cs.meta b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/DialogueNodeEditor.cs.meta
new file mode 100644
index 0000000..e2b5d69
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/DialogueNodeEditor.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d048cb1b0e4723b44adf1206049ce1c4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/DialogueNodeEditor.uss b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/DialogueNodeEditor.uss
new file mode 100644
index 0000000..e69de29
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/DialogueNodeEditor.uss.meta b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/DialogueNodeEditor.uss.meta
new file mode 100644
index 0000000..0f6e599
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/DialogueNodeEditor.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 97d224be4a45d8d4cb433a135b5f3819
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/DialogueNodeEditor.uxml b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/DialogueNodeEditor.uxml
new file mode 100644
index 0000000..bf91720
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/DialogueNodeEditor.uxml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<engine:UXML
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns:engine="UnityEngine.UIElements"
+        xmlns:editor="UnityEditor.UIElements"
+        xsi:noNamespaceSchemaLocation="../../../../../../UIElementsSchema/UIElements.xsd"
+>
+    <engine:Label text="Dialogue Node Options" class="heading"/>
+    <engine:VisualElement class="container">
+        <editor:ObjectField name="objCharacterField" label="Speaker"/>
+        <engine:TextField class="multiline-text-field" name="txtDialogue" multiline="true" label="Dialogue"/>
+    </engine:VisualElement>
+</engine:UXML>
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/DialogueNodeEditor.uxml.meta b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/DialogueNodeEditor.uxml.meta
new file mode 100644
index 0000000..337cba6
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/DialogueNodeEditor.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: ba8322f3f4300634383f65e29f89b2fb
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/NodeEditor.cs b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/NodeEditor.cs
new file mode 100644
index 0000000..f4bc002
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/NodeEditor.cs
@@ -0,0 +1,54 @@
+using UnityEditor;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace lastmilegames.DialogueSystem.Dialogues.Nodes
+{
+    public abstract class NodeEditor : Editor
+    {
+        protected Node node;
+        private VisualElement root;
+
+        private void OnEnable()
+        {
+            node = (Node) target;
+            root = new VisualElement();
+
+            root.Add(SetupEditorGUI());
+            root.Add(SetupBaseNodeEditor());
+        }
+
+        public override VisualElement CreateInspectorGUI()
+        {
+            var globalStyles = AssetDatabase.LoadAssetAtPath<StyleSheet>(
+                "Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/_global.uss");
+            root.styleSheets.Add(globalStyles);
+
+            return root;
+        }
+
+        protected abstract VisualElement SetupEditorGUI();
+
+        private VisualElement SetupBaseNodeEditor()
+        {
+            var elementRoot = new VisualElement();
+
+            var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(
+                "Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/NodeEditor.uxml");
+            visualTree.CloneTree(elementRoot);
+
+            // var styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>(
+            //     "Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/NodeEditor.uss");
+            // elementRoot.styleSheets.Add(styleSheet);
+
+            var txtDevNotes = elementRoot.Q<TextField>("txtDevNotes");
+            txtDevNotes.value = node.DeveloperNotes;
+            txtDevNotes.RegisterValueChangedCallback(evt => node.SetDevNote(evt.newValue));
+
+            var v2PositionField = elementRoot.Q<Vector2Field>("v2Position");
+            v2PositionField.value = node.Position;
+            v2PositionField.RegisterValueChangedCallback(evt => node.SetPosition(evt.newValue));
+            return elementRoot;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/NodeEditor.cs.meta b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/NodeEditor.cs.meta
new file mode 100644
index 0000000..5548ce1
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/NodeEditor.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 512ce4f589174e849e5130a5ab9bf9eb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/NodeEditor.uss b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/NodeEditor.uss
new file mode 100644
index 0000000..e69de29
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/NodeEditor.uss.meta b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/NodeEditor.uss.meta
new file mode 100644
index 0000000..75b9bf5
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/NodeEditor.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e787794282e84aa4eb364c5f5994d220
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/NodeEditor.uxml b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/NodeEditor.uxml
new file mode 100644
index 0000000..566163a
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/NodeEditor.uxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<engine:UXML
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.UIElements"
+        xsi:noNamespaceSchemaLocation="../../../../../../UIElementsSchema/UIElements.xsd"
+        xsi:schemaLocation="UnityEditor.UIElements file:///D:/RiderProjects/DialogueSystem/UIElementsSchema/UnityEditor.UIElements.xsd">
+    <engine:TextField name="txtDevNotes" multiline="true" class="multiline-text-field" label="Developer Notes"/>
+    <Vector2Field class="vector-field" name="v2Position" label="Node Position"/>
+</engine:UXML>
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/NodeEditor.uxml.meta b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/NodeEditor.uxml.meta
new file mode 100644
index 0000000..02c5459
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/NodeEditor.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 29c4063c160604d428f616369a81c417
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/TriggerEventNodeEditor.cs b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/TriggerEventNodeEditor.cs
new file mode 100644
index 0000000..5589791
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/TriggerEventNodeEditor.cs
@@ -0,0 +1,32 @@
+using UnityEditor;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace lastmilegames.DialogueSystem.Dialogues.Nodes
+{
+    [CustomEditor(typeof(TriggerEventNode))]
+    public class TriggerEventNodeEditor : NodeEditor
+    {
+        private SerializedObject sNode;
+        private TriggerEventNode tNode;
+
+        protected override VisualElement SetupEditorGUI()
+        {
+            tNode = (TriggerEventNode) node;
+            sNode = new SerializedObject(tNode);
+
+            var elementRoot = new VisualElement();
+            var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(
+                "Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/TriggerEventNodeEditor.uxml");
+            var styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>(
+                "Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/TriggerEventNodeEditor.uss");
+            visualTree.CloneTree(elementRoot);
+            elementRoot.styleSheets.Add(styleSheet);
+
+            var evtTriggerEventList = elementRoot.Q<PropertyField>("evtTriggerEventList");
+            elementRoot.Bind(sNode);
+
+            return elementRoot;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/TriggerEventNodeEditor.cs.meta b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/TriggerEventNodeEditor.cs.meta
new file mode 100644
index 0000000..4f4727c
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/TriggerEventNodeEditor.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b00639311997fd040a7fa487c514ba12
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/TriggerEventNodeEditor.uss b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/TriggerEventNodeEditor.uss
new file mode 100644
index 0000000..e69de29
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/TriggerEventNodeEditor.uss.meta b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/TriggerEventNodeEditor.uss.meta
new file mode 100644
index 0000000..25a783a
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/TriggerEventNodeEditor.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: dcde22c04e764ab46a0f2d9df0b19b81
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/TriggerEventNodeEditor.uxml b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/TriggerEventNodeEditor.uxml
new file mode 100644
index 0000000..4ff4d09
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/TriggerEventNodeEditor.uxml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<engine:UXML
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns:engine="UnityEngine.UIElements"
+        xmlns:editor="UnityEditor.UIElements"
+        xsi:noNamespaceSchemaLocation="../../../../../../UIElementsSchema/UIElements.xsd"
+>
+    <engine:Label text="Trigger Event Node Options" class="heading"/>
+    <engine:VisualElement class="container">
+        <editor:PropertyField name="evtTriggerEventList" binding-path="onNodeEntered"/>
+    </engine:VisualElement>
+</engine:UXML>
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/TriggerEventNodeEditor.uxml.meta b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/TriggerEventNodeEditor.uxml.meta
new file mode 100644
index 0000000..9cbfe82
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/TriggerEventNodeEditor.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 19057f27319c75540a84e62fe102bdd1
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/_global.uss b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/_global.uss
new file mode 100644
index 0000000..63469e6
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/_global.uss
@@ -0,0 +1,22 @@
+.heading {
+    border-bottom-width: 1px;
+    border-bottom-color: #fff;
+    font-size: 16px;
+    margin-bottom: 5px;
+    padding-bottom: 5px;
+    -unity-font-style: bold;
+}
+
+.multiline-text-field {
+    display: flex;
+    flex-direction: column;
+    min-height: 100px;
+}
+
+.multiline-text-field Label {
+    margin-bottom: 5px;
+}
+
+.multiline-text-field .unity-base-text-field__input {
+    -unity-text-align: upper-left;
+}
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/_global.uss.meta b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/_global.uss.meta
new file mode 100644
index 0000000..630a56a
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Editor/_global.uss.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: fb8c5ccaa61c47c796114e92a6b7bdef
+timeCreated: 1607386170
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/INode.cs b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/INode.cs
new file mode 100644
index 0000000..2243fd7
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/INode.cs
@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace lastmilegames.DialogueSystem.Dialogues.Nodes
+{
+    public interface INode
+    {
+        /// <summary>
+        /// The type of the node.
+        /// </summary>
+        NodeType Type { get; }
+
+        /// <summary>
+        /// The other nodes this node is connected to.
+        /// </summary>
+        List<string> Children { get; }
+
+#if UNITY_EDITOR
+        /// <summary>
+        /// The position of the node.
+        /// </summary>
+        Vector2 Position { get; }
+
+        /// <summary>
+        /// Add a connection from this node to another.
+        /// </summary>
+        /// <param name="newChild">The <code>UnityEngine.Object.name</code> of the node to connect to.</param>
+        void AddChild(string newChild);
+
+        /// <summary>
+        /// Remove a connection from this node to another.
+        /// </summary>
+        /// <param name="child">The <code>UnityEngine.Object.name</code> of the node to disconnect.</param>
+        void RemoveChild(string child);
+
+        /// <summary>
+        /// Update the position of the node.
+        /// </summary>
+        /// <param name="newPosition"></param>
+        void SetPosition(Vector2 newPosition);
+#endif
+    }
+}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/INode.cs.meta b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/INode.cs.meta
new file mode 100644
index 0000000..3fcc4c3
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/INode.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7e7341f60e39476fbc718f83b4d0d877
+timeCreated: 1607120919
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Node.cs b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Node.cs
new file mode 100644
index 0000000..e8b40c4
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Node.cs
@@ -0,0 +1,55 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace lastmilegames.DialogueSystem.Dialogues.Nodes
+{
+    public abstract class Node : ScriptableObject, INode
+    {
+        [SerializeField] protected List<string> children = new List<string>();
+        [SerializeField] protected NodeType type = NodeType.None;
+
+        protected abstract void OnEnable();
+        public List<string> Children => children;
+
+        public NodeType Type => type;
+
+#if UNITY_EDITOR
+        public string DeveloperNotes => developerNotes;
+        [SerializeField] private string developerNotes = "";
+
+        public Vector2 Position => position;
+        [SerializeField] protected Vector2 position = Vector2.zero;
+
+        public void AddChild(string newChild)
+        {
+            // Don't let the node connect to something it is already connected to.
+            if (children.Contains(newChild)) return;
+
+            // Don't connect to self.
+            if (newChild == name) return;
+
+            children.Add(newChild);
+        }
+
+        public void RemoveChild(string child)
+        {
+            children.Remove(child);
+        }
+
+        public void SetPosition(Vector2 newPosition)
+        {
+            position = newPosition;
+        }
+
+        public void SetNodeType(NodeType newType)
+        {
+            type = newType;
+        }
+
+        public void SetDevNote(string newNote)
+        {
+            developerNotes = newNote;
+        }
+#endif
+    }
+}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Node.cs.meta b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Node.cs.meta
new file mode 100644
index 0000000..2aacbfd
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/Node.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 2c7c2f623cb84bf8b91d935c6dc08538
+timeCreated: 1607120935
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/NodeEnums.cs b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/NodeEnums.cs
new file mode 100644
index 0000000..12dfd26
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/NodeEnums.cs
@@ -0,0 +1,18 @@
+namespace lastmilegames.DialogueSystem.Dialogues.Nodes
+{
+    public enum NodeType
+    {
+        None,
+        Dialogue,
+        Condition,
+        Event,
+        JumpToNode,
+        PlayNewDialogue
+    }
+
+    public enum NodeFunction
+    {
+        Get,
+        Set
+    }
+}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/NodeEnums.cs.meta b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/NodeEnums.cs.meta
new file mode 100644
index 0000000..63132a2
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/NodeEnums.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 621818a500434d7f949e3a1da216c670
+timeCreated: 1607121015
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/TriggerEventNode.cs b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/TriggerEventNode.cs
new file mode 100644
index 0000000..0d0a1de
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/TriggerEventNode.cs
@@ -0,0 +1,20 @@
+using UnityEngine;
+using UnityEngine.Events;
+
+namespace lastmilegames.DialogueSystem.Dialogues.Nodes
+{
+    public class TriggerEventNode : Node
+    {
+        [SerializeField] private UnityEvent onNodeEntered = new UnityEvent();
+
+        protected override void OnEnable()
+        {
+            type = NodeType.Event;
+        }
+
+        public void Trigger()
+        {
+            onNodeEntered?.Invoke();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Dialogues/Nodes/TriggerEventNode.cs.meta b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/TriggerEventNode.cs.meta
new file mode 100644
index 0000000..7c49da7
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Dialogues/Nodes/TriggerEventNode.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ecc4c9fd268d4561997da22f08d35aa0
+timeCreated: 1607458192
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor.meta b/Assets/DialogueSystem/Scripts/Editor.meta
deleted file mode 100644
index a4afed4..0000000
--- a/Assets/DialogueSystem/Scripts/Editor.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 020840a2c6564bb7b3cd9e7fd18dc9ae
-timeCreated: 1604008823
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueContainerEditor.cs b/Assets/DialogueSystem/Scripts/Editor/DialogueContainerEditor.cs
deleted file mode 100644
index 3b9d0da..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueContainerEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using lastmilegames.DialogueSystem.DialogueGraphEditor;
-using UnityEditor;
-using UnityEditor.Callbacks;
-using UnityEngine;
-using UnityEngine.UIElements;
-
-namespace lastmilegames.DialogueSystem
-{
-    [CustomEditor(typeof(DialogueContainer))]
-    public class DialogueContainerEditor : Editor
-    {
-        public override void OnInspectorGUI()
-        {
-            DialogueContainer dialogueContainer = target as DialogueContainer;
-            EditorGUILayout.BeginVertical();
-            
-            if (GUILayout.Button("Open Visual Editor"))
-            {
-                DialogueGraph.ShowWindow(dialogueContainer);
-            }
-
-            DrawDefaultInspector();
-            EditorGUILayout.EndVertical();
-        }
-    }
-}
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueContainerEditor.cs.meta b/Assets/DialogueSystem/Scripts/Editor/DialogueContainerEditor.cs.meta
deleted file mode 100644
index 4301214..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueContainerEditor.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 8ec86cfebab04a3aaff7056f9039dbdd
-timeCreated: 1584910605
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/BlackboardProvider.cs b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/BlackboardProvider.cs
deleted file mode 100644
index dfb40a1..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/BlackboardProvider.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System;
-using System.Linq;
-using lastmilegames.DialogueSystem.NodeData;
-using UnityEditor;
-using UnityEditor.Experimental.GraphView;
-using UnityEngine.UIElements;
-
-namespace lastmilegames.DialogueSystem.DialogueGraphEditor
-{
-    public class BlackboardProvider
-    {
-        private readonly DialogueGraphView graphView;
-
-        public BlackboardProvider(DialogueGraphView graphView)
-        {
-            this.graphView = graphView;
-
-            Blackboard = new Blackboard
-            {
-                scrollable = true,
-                addItemRequested = AddItemRequested,
-                editTextRequested = EditTextRequested
-            };
-        }
-
-        public Blackboard Blackboard { get; private set; }
-
-        public void RefreshProperties()
-        {
-            Blackboard.contentContainer.Clear();
-            foreach (ExposedProperty property in graphView.exposedProperties)
-            {
-                Blackboard.Add(GenerateBlackboardField(property));
-            }
-        }
-
-        private void EditTextRequested(Blackboard blackboard, VisualElement element, string value)
-        {
-            string currentName = ((BlackboardField) element).text;
-            string nextName = ValidateName(value);
-
-            if (graphView.exposedProperties.Any(property => property.propertyName == nextName))
-            {
-                EditorUtility.DisplayDialog(
-                    "Error",
-                    $"A property with the name \"{nextName}\" already exists.",
-                    "OK"
-                );
-                return;
-            }
-
-            int propertyIndex = graphView.exposedProperties.FindIndex(x => x.propertyName == currentName);
-            graphView.exposedProperties[propertyIndex].propertyName = nextName;
-            ((BlackboardField) element).text = nextName;
-        }
-
-        private void AddItemRequested(Blackboard blackboard)
-        {
-            var property = new ExposedProperty();
-            property.propertyName = ValidateName(property.propertyName);
-            graphView.exposedProperties.Add(property);
-
-            blackboard.Add(GenerateBlackboardField(property));
-        }
-
-        private VisualElement GenerateBlackboardField(ExposedProperty property)
-        {
-            var container = new VisualElement();
-            var blackboardField = new BlackboardField
-            {
-                text = property.propertyName,
-                typeText = "String",
-            };
-            container.Add(blackboardField);
-
-            var propertyValueTextField = new TextField("Value:");
-            propertyValueTextField.Q(className: "unity-label").style.minWidth = 50;
-            propertyValueTextField.value = property.propertyValue;
-            propertyValueTextField.RegisterValueChangedCallback(evt =>
-            {
-                int changingPropertyIndex = graphView.exposedProperties.FindIndex(
-                    exposedProperty => exposedProperty.propertyName == property.propertyName);
-                graphView.exposedProperties[changingPropertyIndex].propertyValue = evt.newValue;
-            });
-
-            var blackboardValueRow = new BlackboardRow(propertyValueTextField, propertyValueTextField);
-            container.Add(blackboardValueRow);
-
-            return container;
-        }
-
-        private string ValidateName(string name)
-        {
-            if (string.IsNullOrWhiteSpace(name)) return null;
-
-            var newName = "";
-            string[] nameArray = name.Split(new[] {"@@"}, StringSplitOptions.None);
-
-            foreach (string s in nameArray)
-            {
-                if (s.Trim() == "@@") continue;
-
-                newName += s.Trim().Normalize().ToUpper();
-            }
-
-            var nextName = $@"@@{newName}@@";
-
-            int matchCount = graphView.exposedProperties.FindAll(property => property.propertyName == nextName).Count;
-
-            if (matchCount > 0)
-            {
-                return $@"@@{newName}{matchCount}@@";
-            }
-            else
-            {
-                return nextName;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/BlackboardProvider.cs.meta b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/BlackboardProvider.cs.meta
deleted file mode 100644
index b3778c8..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/BlackboardProvider.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: f584819ee1804ab6a93f96572240bd1d
-timeCreated: 1604443943
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/DialogueGraph.cs b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/DialogueGraph.cs
deleted file mode 100644
index 3edd3cf..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/DialogueGraph.cs
+++ /dev/null
@@ -1,214 +0,0 @@
-using System.Linq;
-using lastmilegames.DialogueSystem.NodeData;
-using UnityEditor;
-using UnityEditor.Callbacks;
-using UnityEditor.Experimental.GraphView;
-using UnityEditor.UIElements;
-using UnityEngine;
-using UnityEngine.UIElements;
-
-namespace lastmilegames.DialogueSystem.DialogueGraphEditor
-{
-    /// <summary>
-    /// Represents the parent EditorWindow for the dialogue visual editor.
-    /// </summary>
-    public class DialogueGraph : EditorWindow
-    {
-        /// <summary>
-        /// The data utility for saving/loading graphs.
-        /// </summary>
-        private static DialogueGraphDataUtility dialogueGraphDataUtility;
-
-        private static DialogueContainer dialogueContainer;
-
-        /// <summary>
-        /// The GraphView instance.
-        /// </summary>
-        private DialogueGraphView _graphView;
-
-        /// <summary>
-        /// The GraphView.MiniMap instance.
-        /// </summary>
-        private MiniMap _miniMap;
-
-        private BlackboardProvider blackboardProvider;
-
-        /// <summary>
-        /// Mini map visibility.
-        /// </summary>
-        private bool _miniMapEnabled;
-
-        /// <summary>
-        /// Opens the DialogueGraph editor window.
-        /// </summary>
-        public static void ShowWindow(DialogueContainer container)
-        {
-            dialogueContainer = container;
-
-            var window = GetWindow<DialogueGraph>();
-            window.titleContent = new GUIContent(dialogueContainer.name);
-            window.Show();
-        }
-
-        [MenuItem("Dialogue Editor/Open Editor Window")]
-        [MenuItem("Assets/DialogueEditor/Open Editor Window")]
-        public static bool ShowEditor()
-        {
-            dialogueContainer = Selection.activeObject as DialogueContainer;
-
-            if (dialogueContainer)
-            {
-                ShowWindow(dialogueContainer);
-                return true;
-            }
-
-            return false;
-        }
-
-        [MenuItem("Dialogue Editor/Open Editor Window", true)]
-        [MenuItem("Assets/DialogueEditor/Open Editor Window", true)]
-        public static bool ValidateValidObjectSelected()
-        {
-            return Selection.activeObject is DialogueContainer;
-        }
-
-        [MenuItem("Dialogue Editor/New Dialogue Container")]
-        public static void NewDialogue()
-        {
-            var container = CreateInstance<DialogueContainer>();
-            string path = EditorUtility.SaveFilePanel(
-                "New Dialogue Container",
-                "Assets/",
-                "New Dialogue Container.asset",
-                "asset"
-            );
-
-            if (path.Length == 0) return;
-
-            if (dialogueGraphDataUtility == null)
-            {
-                dialogueGraphDataUtility = new DialogueGraphDataUtility();
-            }
-
-            dialogueGraphDataUtility.SaveGraph(path, container);
-
-            bool openDialogueEditor = EditorUtility.DisplayDialog(
-                "Open Dialogue Editor Now?",
-                "Would you like to open the Dialogue Editor and edit this conversation now?",
-                "Yes",
-                "No"
-            );
-
-            if (openDialogueEditor)
-            {
-                ShowWindow(container);
-            }
-        }
-
-        [OnOpenAsset]
-        public static bool OnOpenAsset(int instanceId, int line)
-        {
-            string assetPath = AssetDatabase.GetAssetPath(instanceId);
-            var container = AssetDatabase.LoadAssetAtPath<DialogueContainer>(assetPath);
-
-            if (container)
-            {
-                ShowWindow(container);
-                return true;
-            }
-
-            return false;
-        }
-
-        private void OnEnable()
-        {
-            InitializeGraphView();
-        }
-
-        private void OnGUI()
-        {
-            // Enable mini map if visible.
-            if (_miniMap != null) _miniMap.visible = _miniMapEnabled;
-        }
-
-        /// <summary>
-        /// Prepares the window elements.
-        /// </summary>
-        private void InitializeGraphView()
-        {
-            // Set the root elements flex direction
-            rootVisualElement.style.flexDirection = FlexDirection.Column;
-
-            // Create the window elements
-            rootVisualElement.Add(GenerateToolbar());
-
-            _graphView = GenerateGraphView();
-            rootVisualElement.Add(_graphView);
-
-            _miniMap = GenerateMiniMap();
-            _graphView.Add(_miniMap);
-
-            blackboardProvider = new BlackboardProvider(_graphView);
-            _graphView.Add(blackboardProvider.Blackboard);
-
-            // Get the data utility so we can save and load.
-            dialogueGraphDataUtility = new DialogueGraphDataUtility(_graphView);
-
-            if (dialogueContainer != null) dialogueGraphDataUtility.LoadGraph(dialogueContainer, blackboardProvider);
-        }
-
-        /// <summary>
-        /// Creates and populates a UIElements.Toolbar
-        /// </summary>
-        /// <returns>Returns the UIElements.Toolbar with controls.</returns>
-        private Toolbar GenerateToolbar()
-        {
-            // Create the toolbar and load the stylesheet.
-            Toolbar toolbar = new Toolbar();
-            toolbar.styleSheets.Add(Resources.Load<StyleSheet>("Toolbar"));
-
-            // Button to save the asset
-            toolbar.Add(new ToolbarButton(() => { dialogueGraphDataUtility.SaveGraph(dialogueContainer); })
-            {
-                text = "Save Asset"
-            });
-
-            // Flexible spacer.
-            toolbar.Add(new ToolbarSpacer() {flex = true});
-
-            // Button to toggle the mini map visibility.
-            ToolbarToggle toggleMiniMap = new ToolbarToggle {text = "Toggle MiniMap"};
-            toggleMiniMap.RegisterValueChangedCallback(evt => { _miniMapEnabled = evt.newValue; });
-            toolbar.Add(toggleMiniMap);
-
-            return toolbar;
-        }
-
-        /// <summary>
-        /// Creates the default instance of DialogueGraphView.
-        /// </summary>
-        /// <returns>Returns a default DialogueGraphView.</returns>
-        private DialogueGraphView GenerateGraphView()
-        {
-            DialogueGraphView graphView = new DialogueGraphView(this)
-            {
-                name = "Dialogue Graph"
-            };
-            graphView.style.flexGrow = 1;
-
-            return graphView;
-        }
-
-        /// <summary>
-        /// Creates a default mini map.
-        /// </summary>
-        /// <returns>Returns a default mini map to add to the DialogueGraphView.</returns>
-        private MiniMap GenerateMiniMap()
-        {
-            var miniMap = new MiniMap {visible = _miniMapEnabled};
-            Vector2 coords = _graphView.contentViewContainer.WorldToLocal(new Vector2(this.maxSize.x - 10, 30));
-            miniMap.SetPosition(new Rect(coords.x, coords.y, 200, 140));
-            return miniMap;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/DialogueGraph.cs.meta b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/DialogueGraph.cs.meta
deleted file mode 100644
index f646a68..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/DialogueGraph.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: cedf0977d78b4b8d8cb0f6ed287ce566
-timeCreated: 1582072504
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/DialogueGraphDataUtility.cs b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/DialogueGraphDataUtility.cs
deleted file mode 100644
index 0af132d..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/DialogueGraphDataUtility.cs
+++ /dev/null
@@ -1,350 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using lastmilegames.DialogueSystem.DialogueGraphEditor.Nodes;
-using lastmilegames.DialogueSystem.NodeData;
-using UnityEditor;
-using UnityEditor.Experimental.GraphView;
-using UnityEngine;
-using UnityEngine.UIElements;
-using Object = UnityEngine.Object;
-
-namespace lastmilegames.DialogueSystem.DialogueGraphEditor
-{
-    /// <summary>
-    /// A utility class for saving and loading DialogueGraphs
-    /// </summary>
-    public class DialogueGraphDataUtility
-    {
-        private readonly DialogueGraphView targetGraphView;
-        private IEnumerable<Edge> Edges => targetGraphView == null ? new List<Edge>() : targetGraphView.edges.ToList();
-        private List<DialogueNode> dialogueNodes;
-        private List<ConditionNode> conditionNodes;
-        private List<ExposedProperty> exposedProperties;
-        private EntryNode entryNode;
-
-        public DialogueGraphDataUtility()
-        {
-            // Default constructor to just save container. Doesn't target a graph;
-            targetGraphView = null;
-        }
-
-        public DialogueGraphDataUtility(DialogueGraphView targetGraphView)
-        {
-            this.targetGraphView = targetGraphView;
-        }
-
-        /// <summary>
-        /// Saves the currently loaded graph to a DialogueContainer asset file.
-        /// </summary>
-        /// <param name="container">The existing <code>DialogueContainer</code> to save to.</param>
-        public void SaveGraph(DialogueContainer container)
-        {
-            CacheGraphData();
-            SaveNodes(container);
-            SaveNodeLinks(container);
-
-            AssetDatabase.SaveAssets();
-        }
-
-        /// <summary>
-        /// Creates a new <code>DialogueContainer</code> asset at the provided location and then saves the current graph to the asset.
-        /// </summary>
-        /// <param name="path">The path for the <code>DialogueContainer</code>. This can be relative to the project root or absolute.</param>
-        /// <param name="container">The <code>DialogueContainer</code> to save to the asset.</param>
-        public void SaveGraph(string path, DialogueContainer container)
-        {
-            WriteAssetFile(container, path);
-        
-            SaveGraph(container);
-        }
-
-        public void LoadGraph(DialogueContainer container, BlackboardProvider blackboardProvider)
-        {
-            ClearGraph(container);
-            CreateNodes(container);
-            ConnectNodes(container);
-            LoadExposedProperties(container, blackboardProvider);
-        }
-
-        private void ClearGraph(DialogueContainer container)
-        {
-            foreach (Node node in targetGraphView.nodes.ToList())
-            {
-                // If the entry node, reset the GUID and continue.
-                if (node is EntryNode entry)
-                {
-                    entry.Guid = container.entryNode.guid;
-                    entry.SetPosition(new Rect(container.entryNode.position, BaseNode.DefaultNodeSize));
-                }
-                else // disconnect the node, then remove the node.
-                {
-                    Edges.Where(edge => edge.input.node == node).ToList()
-                        .ForEach(edge => targetGraphView.RemoveElement(edge));
-
-                    targetGraphView.RemoveElement(node);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Cache the nodes by looping though them and sorting them based on type
-        /// </summary>
-        private void CacheGraphData()
-        {
-            entryNode = new EntryNode();
-            dialogueNodes = new List<DialogueNode>();
-            conditionNodes = new List<ConditionNode>();
-            exposedProperties = new List<ExposedProperty>();
-
-            if (targetGraphView == null) return;
-            foreach (Node node in targetGraphView.nodes.ToList())
-            {
-                Type nodeType = node.GetType();
-
-                // Sort the nodes into their respective objects.
-                if (nodeType == typeof(EntryNode))
-                {
-                    entryNode = node as EntryNode;
-                }
-                else if (nodeType == typeof(DialogueNode))
-                {
-                    dialogueNodes.Add(node as DialogueNode);
-                }
-                else if (nodeType == typeof(ConditionNode))
-                {
-                    conditionNodes.Add(node as ConditionNode);
-                }
-            }
-
-            exposedProperties = targetGraphView.exposedProperties;
-        }
-
-        private void SaveNodes(DialogueContainer container)
-        {
-            CreateEntryNodeData(container);
-            CreateDialogueNodeData(container);
-            CreateConditionNodeData(container);
-        }
-
-        private void CreateEntryNodeData(DialogueContainer container)
-        {
-            container.entryNode = new BaseNodeData
-            {
-                guid = entryNode.Guid,
-                position = entryNode.GetPosition().position,
-                type = entryNode.type
-            };
-        }
-
-        private void CreateDialogueNodeData(DialogueContainer container)
-        {
-            container.dialogueNodeData.Clear();
-            // Create DialogueNodeData
-            foreach (DialogueNode dialogueNode in dialogueNodes)
-            {
-                List<string> responses = new List<string>();
-                List<DialogueCondition> conditionsToToggle = new List<DialogueCondition>();
-
-                foreach (DialogueNodePort dialogueNodePort in dialogueNode.DialogueNodePorts)
-                {
-                    responses.Add(dialogueNodePort.ResponseText);
-                    conditionsToToggle.Add(dialogueNodePort.ConditionToToggle);
-                }
-
-                container.dialogueNodeData.Add(new DialogueNodeData
-                {
-                    guid = dialogueNode.Guid,
-                    type = dialogueNode.type,
-                    position = dialogueNode.GetPosition().position,
-                    dialogueText = dialogueNode.DialogueText,
-                    speakerName = dialogueNode.SpeakerName,
-                    responses = responses,
-                    conditionsToToggle = conditionsToToggle
-                });
-            }
-        }
-
-        private void CreateConditionNodeData(DialogueContainer container)
-        {
-            container.conditionNodeData.Clear();
-            foreach (ConditionNode conditionNode in conditionNodes)
-            {
-                container.conditionNodeData.Add(new ConditionNodeData
-                {
-                    guid = conditionNode.Guid,
-                    position = conditionNode.GetPosition().position,
-                    conditionToTest = conditionNode.ConditionToTest,
-                    type = conditionNode.type
-                });
-            }
-        }
-
-        private void SaveNodeLinks(DialogueContainer container)
-        {
-            if (!Edges.Any()) return; // Skip if there are no connections between nodes.
-
-            container.nodeLinkData.Clear();
-
-            // Find all connected nodes
-            Edge[] connectedPorts = Edges.Where(port => port.input.node != null).ToArray();
-
-            // Iterate through each connection
-            foreach (Edge port in connectedPorts)
-            {
-                var outputNode = (BaseNode) port.output.node;
-                var inputNode = (BaseNode) port.input.node;
-
-                // Add data to list
-                container.nodeLinkData.Add(new NodeLinkData
-                {
-                    baseNodeGuid = outputNode.Guid,
-                    baseNodeType = outputNode.type,
-                    targetNodeGuid = inputNode.Guid,
-                    targetNodeType = inputNode.type
-                });
-
-                Debug.Break();
-            }
-        }
-
-        /// <summary>
-        /// Write the asset file to the top level resources folder.
-        /// </summary>
-        /// <param name="container">The DialogueContainer to write to the asset file.</param>
-        /// <param name="path">The name to give the asset file.</param>
-        private static void WriteAssetFile(Object container, string path = "Assets/Resources")
-        {
-            string[] pathArray = path.Split('/');
-            string assetName = pathArray[pathArray.Length - 1];
-            var inAssetDirectory = false;
-            var assetPath = "";
-
-            // Build the absolute path relative to the project root.
-            for (var i = 0; i < pathArray.Length - 1; i++)
-            {
-                if (pathArray[i] == "Assets")
-                {
-                    inAssetDirectory = true;
-                    continue;
-                }
-
-                if (!inAssetDirectory) continue;
-                assetPath += $"/{pathArray[i]}";
-            }
-
-            bool validFolder = AssetDatabase.IsValidFolder("Assets" + assetPath);
-
-            if (!validFolder)
-            {
-                string[] assetPathArray = assetPath.Split('/');
-                for (var i = 1; i < assetPathArray.Length; i++)
-                {
-                    string parent = i == 1 ? "Assets/" : assetPathArray[i - 1];
-                    AssetDatabase.CreateFolder(parent, assetPathArray[i]);
-                }
-            }
-
-            AssetDatabase.CreateAsset(container, $"Assets/{assetPath}/{assetName}");
-            AssetDatabase.SaveAssets();
-        }
-
-
-        private void CreateNodes(DialogueContainer container)
-        {
-            foreach (DialogueNodeData nodeData in container.dialogueNodeData)
-            {
-                DialogueNode tempNode = targetGraphView.CreateDialogueNode(nodeData);
-                tempNode.Guid = nodeData.guid;
-                tempNode.SetPosition(new Rect(nodeData.position, BaseNode.DefaultNodeSize));
-                targetGraphView.AddElement(tempNode);
-            }
-
-            foreach (ConditionNodeData nodeData in container.conditionNodeData)
-            {
-                ConditionNode tempNode = targetGraphView.CreateConditionNode(nodeData);
-                tempNode.Guid = nodeData.guid;
-                tempNode.SetPosition(new Rect(nodeData.position, BaseNode.DefaultNodeSize));
-                targetGraphView.AddElement(tempNode);
-            }
-        }
-
-        private void ConnectNodes(DialogueContainer container)
-        {
-            if (!container.nodeLinkData.Any()) return;
-
-            List<BaseNode> nodes = targetGraphView.nodes.ToList().Cast<BaseNode>().ToList();
-            foreach (BaseNode node in nodes)
-            {
-                switch (node)
-                {
-                    // Connect entry node to targets
-                    case EntryNode entry:
-                    {
-                        string targetNodeGuid = container.nodeLinkData.First(data =>
-                            data.baseNodeGuid == entry.Guid).targetNodeGuid;
-                        BaseNode targetNode = nodes.First(x => x.Guid == targetNodeGuid);
-                        LinkNodes(
-                            (Port) entry.outputContainer[0],
-                            (Port) targetNode.inputContainer[0]
-                        );
-                        break;
-                    }
-                    // Connect dialogue nodes to targets
-                    case DialogueNode dialogue:
-                    {
-                        List<NodeLinkData> dialogueNodeConnections =
-                            container.nodeLinkData.Where(data => data.baseNodeGuid == node.Guid).ToList();
-                        for (var i = 0; i < dialogueNodeConnections.Count; i++)
-                        {
-                            string targetNodeGuid = dialogueNodeConnections[i].targetNodeGuid;
-                            BaseNode targetNode = nodes.First(n => n.Guid == targetNodeGuid);
-                            LinkNodes(
-                                dialogue.DialogueNodePorts[i].Port,
-                                (Port) targetNode.inputContainer[0]
-                            );
-                        }
-
-                        break;
-                    }
-                    // Connect the rest of the nodes to their targets
-                    // Works for anything that doesn't add a special way of handling ports.
-                    default:
-                    {
-                        List<NodeLinkData> connections =
-                            container.nodeLinkData.Where(data => data.baseNodeGuid == node.Guid).ToList();
-                        for (var i = 0; i < connections.Count; i++)
-                        {
-                            string targetNodeGuid = connections[i].targetNodeGuid;
-                            BaseNode targetNode = nodes.First(n => n.Guid == targetNodeGuid);
-                            LinkNodes(node.outputContainer[i].Q<Port>(), (Port) targetNode.inputContainer[0]);
-                        }
-
-                        break;
-                    }
-                }
-            }
-        }
-
-        private void LinkNodes(Port output, Port input)
-        {
-            var tempEdge = new Edge
-            {
-                output = output,
-                input = input
-            };
-
-            tempEdge.input.Connect(tempEdge);
-            tempEdge.output.Connect(tempEdge);
-
-            targetGraphView.Add(tempEdge);
-        }
-
-        private void LoadExposedProperties(DialogueContainer container, BlackboardProvider blackboardProvider)
-        {
-            targetGraphView.exposedProperties.Clear();
-            targetGraphView.exposedProperties  = container.exposedProperties;
-            blackboardProvider.RefreshProperties();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/DialogueGraphDataUtility.cs.meta b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/DialogueGraphDataUtility.cs.meta
deleted file mode 100644
index e5964f4..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/DialogueGraphDataUtility.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: efae80c882ff4c3894453883d2c17582
-timeCreated: 1582742988
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/DialogueGraphView.cs b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/DialogueGraphView.cs
deleted file mode 100644
index e0316f1..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/DialogueGraphView.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using lastmilegames.DialogueSystem.DialogueGraphEditor.Nodes;
-using lastmilegames.DialogueSystem.NodeData;
-using UnityEditor;
-using UnityEditor.Experimental.GraphView;
-using UnityEngine;
-using UnityEngine.UIElements;
-
-namespace lastmilegames.DialogueSystem.DialogueGraphEditor
-{
-    /// <summary>
-    /// Represents the main GraphView for Dialogues
-    /// </summary>
-    public class DialogueGraphView : GraphView
-    {
-        public List<ExposedProperty> exposedProperties;
-        public Blackboard blackboard;
-
-        private SearchWindowProvider _searchWindow;
-
-        /// <summary>
-        /// Sets the initial settings for the DialogueGraphView instance.
-        /// </summary>
-        public DialogueGraphView(EditorWindow editorWindow)
-        {
-            if (exposedProperties == null) exposedProperties = new List<ExposedProperty>();
-            
-            // Load the stylesheet.
-            styleSheets.Add(Resources.Load<StyleSheet>("DialogueGraph"));
-
-            // Setup features for zooming, dragging, and selecting.
-            SetupZoom(ContentZoomer.DefaultMinScale, ContentZoomer.DefaultMaxScale);
-            this.AddManipulator(new ContentDragger());
-            this.AddManipulator(new SelectionDragger());
-            this.AddManipulator(new RectangleSelector());
-
-            // Draw the grid.
-            GridBackground grid = new GridBackground();
-            Insert(0, grid);
-            grid.StretchToParentSize();
-
-            // Create the start node.
-            AddElement(GenerateEntryPointNode());
-
-            AddSearchWindow(editorWindow);
-        }
-
-        private void AddSearchWindow(EditorWindow editorWindow)
-        {
-            _searchWindow = ScriptableObject.CreateInstance<SearchWindowProvider>();
-            _searchWindow.Init(editorWindow, this);
-            nodeCreationRequest = context =>
-                SearchWindow.Open(new SearchWindowContext(context.screenMousePosition), _searchWindow);
-        }
-
-        /// <summary>
-        /// Get all ports compatible with a given port.
-        /// </summary>
-        /// <param name="startPort">Start port to validate against.</param>
-        /// <param name="nodeAdapter">Node adapter</param>
-        /// <returns>List of compatible ports.</returns>
-        public override List<Port> GetCompatiblePorts(Port startPort, NodeAdapter nodeAdapter)
-        {
-            List<Port> compatiblePorts = new List<Port>();
-            ports.ForEach(port =>
-            {
-                if (startPort != port // The target port is not itself
-                    && startPort.node != port.node // The target port is not on the same node.
-                    && startPort.direction != port.direction // The target port is not the same direction.
-                )
-                {
-                    compatiblePorts.Add(port);
-                }
-            });
-
-            return compatiblePorts;
-        }
-
-        /// <summary>
-        /// Creates a basic node to serve as an entry point.
-        /// </summary>
-        /// <returns>Returns a node with a single output port.</returns>
-        private static EntryNode GenerateEntryPointNode()
-        {
-            EntryNode node = new EntryNode {title = "Start"};
-
-            // Remove the entry port
-            node.inputContainer.RemoveAt(0);
-
-            // Create the output port.
-            node.GeneratePort(node, "Next", Direction.Output);
-
-            // Prevent the deletion of the node.
-            node.capabilities &= ~Capabilities.Deletable;
-
-            // Set the default position of the node.
-            node.SetPosition(new Rect(100, 200, 100, 150));
-
-            return node;
-        }
-
-        /// <summary>
-        /// Creates a node of the given type.
-        /// </summary>
-        /// <param name="nodeType">The type of node to create.</param>
-        /// <param name="position">The position to create the node at.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when the provided nodeType is invalid.</exception>
-        public void CreateNode(NodeType nodeType, Vector2 position)
-        {
-            switch (nodeType)
-            {
-                case NodeType.Condition:
-                    AddElement(CreateConditionNode(position));
-                    break;
-                case NodeType.Dialogue:
-                    AddElement(CreateDialogueNode(position));
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(nodeType), nodeType, null);
-            }
-        }
-
-        /// <summary>
-        /// Creates a new default ConditionNode at the given location.
-        /// </summary>
-        /// <param name="position"></param>
-        /// <returns>A condition node with default values.</returns>
-        private ConditionNode CreateConditionNode(Vector2 position)
-        {
-            ConditionNode node = new ConditionNode {title = "Condition"};
-            node.SetPosition(new Rect(position, BaseNode.DefaultNodeSize));
-            return node;
-        }
-
-        /// <summary>
-        /// Creates a new Condition node with given values.
-        /// </summary>
-        /// <param name="nodeData">The values to initialize the node with.</param>
-        /// <returns>A condition node with the initialized values.</returns>
-        public ConditionNode CreateConditionNode(ConditionNodeData nodeData)
-        {
-            return new ConditionNode(nodeData);
-        }
-
-        /// <summary>
-        /// Creates a new DialogueNode with default values at a given position
-        /// </summary>
-        /// <param name="position">The position to create the node at.</param>
-        /// <returns>A new dialogue node with default values.</returns>
-        private DialogueNode CreateDialogueNode(Vector2 position)
-        {
-            DialogueNode node = new DialogueNode(OnClickRemoveOutputPort);
-            node.SetPosition(new Rect(position, BaseNode.DefaultNodeSize));
-            return node;
-        }
-
-        /// <summary>
-        /// Creates a new DialogueNode with given values.
-        /// </summary>
-        /// <param name="nodeData">The values to initialize the node with.</param>
-        /// <returns>A dialogue node initialized with the given values.</returns>
-        public DialogueNode CreateDialogueNode(DialogueNodeData nodeData)
-        {
-            return new DialogueNode(OnClickRemoveOutputPort, nodeData);
-        }
-
-
-        private void OnClickRemoveOutputPort(Node node, Port port)
-        {
-            // Find all the edges (connections) this port makes to others.
-            IEnumerable<Edge> targetEdges = edges.ToList()
-                .Where(x => x.output == port && x.output.node == port.node)
-                .ToList();
-
-            // If any edges were found, remove them.
-            if (targetEdges.Any())
-            {
-                Edge edge = targetEdges.First();
-                edge.input.Disconnect(edge);
-                RemoveElement(targetEdges.First());
-            }
-
-            // If the node is a dialogueNode, we need to remove the DialogueNodePort element.
-            if (node is DialogueNode dialogueNode)
-            {
-                List<DialogueNodePort> choicePorts = dialogueNode.DialogueNodePorts;
-                choicePorts.Remove(choicePorts.Find(x => x.Port == port));
-            }
-
-            // Finally, remove the port and refresh the UI.
-            node.outputContainer.Remove(port);
-            node.RefreshExpandedState();
-            node.RefreshPorts();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/BaseNode.cs b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/BaseNode.cs
deleted file mode 100644
index a594a0c..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/BaseNode.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using lastmilegames.DialogueSystem.NodeData;
-using UnityEditor.Experimental.GraphView;
-using UnityEngine;
-using UnityEngine.UIElements;
-
-namespace lastmilegames.DialogueSystem.DialogueGraphEditor.Nodes
-{
-    /// <summary>
-    /// The base class all DialogueGraphEditor nodes inherit from.
-    /// </summary>
-    public abstract class BaseNode : Node
-    {
-        /// <summary>
-        /// The default minimum size of a node.
-        /// Nodes will expand based on USS rules.
-        /// </summary>
-        public static readonly Vector2 DefaultNodeSize = new Vector2(150, 200);
-
-        /// <summary>
-        /// The node's unique identifier. 
-        /// </summary>
-        public string Guid { get; set; }
-
-        /// <summary>
-        /// Represents the type of node.
-        /// </summary>
-        public NodeType type;
-
-        /// <summary>
-        /// The action delegate to call when the remove port button is clicked.
-        /// </summary>
-        protected readonly Action<Node, Port> onClickRemovePort;
-
-        /// <summary>
-        /// Creates a default node with an input port.
-        /// </summary>
-        protected BaseNode()
-        {
-            Guid = System.Guid.NewGuid().ToString();
-            type = NodeType.NotSet;
-
-            GeneratePort(this, "Input", Direction.Input, Port.Capacity.Multi);
-            inputContainer.Q<Port>().portColor = Color.cyan;
-            onClickRemovePort = (node, port) =>
-            {
-                Debug.LogWarningFormat(
-                    "No remove port action set on node {0} port {1}",
-                    port.parent.IndexOf(port),
-                    Guid
-                );
-            };
-        }
-
-        /// <summary>
-        /// Generates a node with an onClickRemovePort event.
-        /// </summary>
-        /// <param name="onClickRemovePort">Event that fires when remove port button is clicked.</param>
-        protected BaseNode(Action<Node, Port> onClickRemovePort)
-        {
-            Guid = System.Guid.NewGuid().ToString();
-            this.onClickRemovePort = onClickRemovePort;
-
-            // Create input port
-            GeneratePort(this, "Input", Direction.Input, Port.Capacity.Multi);
-            inputContainer.Q<Port>().portColor = Color.cyan;
-        }
-
-        /// <summary>
-        /// Generates a new standard GraphView.Port
-        /// </summary>
-        /// <param name="node">Node to add port to.</param>
-        /// <param name="portName">Name of the port.</param>
-        /// <param name="portDirection">Whether the port is an input or output port.</param>
-        /// <param name="capacity">Whether the port can only accept one connection or multiple.</param>
-        /// <param name="type">The value type of the port.</param>
-        /// <returns>Return the generated port,</returns>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when an invalid direction is provided.</exception>
-        public Port GeneratePort(Node node, string portName, Direction portDirection, Port.Capacity capacity
-            = Port.Capacity.Single, Type type = null)
-        {
-            Port port = node.InstantiatePort(Orientation.Horizontal, portDirection, capacity, type);
-            port.portName = portName;
-
-            switch (portDirection)
-            {
-                case Direction.Input:
-                    node.inputContainer.Add(port);
-                    break;
-                case Direction.Output:
-                    node.outputContainer.Add(port);
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(portDirection), portDirection, null);
-            }
-
-            return port;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/ConditionNode.cs b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/ConditionNode.cs
deleted file mode 100644
index ad987a7..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/ConditionNode.cs
+++ /dev/null
@@ -1,203 +0,0 @@
-using lastmilegames.DialogueSystem.NodeData;
-using UnityEditor;
-using UnityEditor.Experimental.GraphView;
-using UnityEditor.UIElements;
-using UnityEngine;
-using UnityEngine.UIElements;
-using UnityEngine.Windows;
-using static UnityEngine.ScriptableObject;
-
-namespace lastmilegames.DialogueSystem.DialogueGraphEditor.Nodes
-{
-    /// <summary>
-    /// Represents a conditional branch in the dialogue.
-    /// </summary>
-    public class ConditionNode : BaseNode
-    {
-        /// <summary>
-        /// The UIElements.TextField for new condition names.
-        /// </summary>
-        private TextField _conditionNameTextField;
-        
-        /// <summary>
-        /// The UIElements.ObjectField that selects the ConditionToTest. 
-        /// </summary>
-        private ObjectField _conditionObjectField;
-        
-        /// <summary>
-        /// A UIElements.Toggle that binds and controls the initialValue of the _conditionObjectField's DialogueCondition.
-        /// </summary>
-        private Toggle _conditionObjectToggle;
-        
-        /// <summary>
-        /// The UIElements.Foldout that contains all the controls.
-        /// </summary>
-        private Foldout _contentFoldout;
-        
-        /// <summary>
-        /// The UIElements.Button for creating a new DialogueCondition asset.
-        /// </summary>
-        private Button _createConditionAssetButton;
-        
-        /// <summary>
-        /// The DialogueCondition to test against and determine the next DialogueNode.
-        /// </summary>
-        public DialogueCondition ConditionToTest;
-
-        /// <summary>
-        /// Generates a new, default ConditionNode
-        /// </summary>
-        public ConditionNode()
-        {
-            type = NodeType.Condition;
-            
-            styleSheets.Add(Resources.Load<StyleSheet>("Node"));
-            
-            GenerateOutputPorts();
-            BuildNodeControls();
-            UpdateNodeFields();
-        }
-
-        /// <summary>
-        /// Generates a new ConditionNode with existing data.
-        /// </summary>
-        /// <param name="nodeData"></param>
-        public ConditionNode(ConditionNodeData nodeData)
-        {
-            Guid = nodeData.guid;
-            type = NodeType.Condition;
-            ConditionToTest = nodeData.conditionToTest;
-
-            styleSheets.Add(Resources.Load<StyleSheet>("Node"));
-
-            GenerateOutputPorts();
-            BuildNodeControls();
-            UpdateNodeFields();
-        }
-
-        /// <summary>
-        /// Creates the true/false ports that branch the dialogue.
-        /// </summary>
-        private void GenerateOutputPorts()
-        {
-            Port ifTruePort = GeneratePort(this, "If True", Direction.Output);
-            ifTruePort.name = "ifTruePort";
-            ifTruePort.portColor = Color.green;
-
-            Port ifFalsePort = GeneratePort(this, "If False", Direction.Output);
-            ifFalsePort.name = "ifFalsePort";
-            ifFalsePort.portColor = Color.red;
-        }
-
-        /// <summary>
-        /// Builds the controls.
-        /// </summary>
-        private void BuildNodeControls()
-        {
-            // Create the containing foldout.
-            _contentFoldout = new Foldout {text = "Condition Properties", name = "condition-properties-foldout"};
-            contentContainer.Add(_contentFoldout);
-
-            // Create the UIElements.Object field to select the DialogueCondition to test against.
-            _conditionObjectField = new ObjectField("Condition Object")
-                {objectType = typeof(DialogueCondition), allowSceneObjects = false, value = ConditionToTest};
-
-            // Create the UIElements.Toggle that controls ConditionToTest.initialValue
-            _conditionObjectToggle = new Toggle("Initial Value") {bindingPath = "initialValue"};
-            _conditionObjectField.RegisterValueChangedCallback(evt =>
-            {
-                ConditionToTest = evt.newValue as DialogueCondition;
-                _conditionObjectToggle.Unbind();
-                
-                if (ConditionToTest != null)
-                {
-                    SerializedObject so = new SerializedObject(ConditionToTest);
-                    _conditionObjectToggle.Bind(so);
-                }
-
-                UpdateNodeFields();
-            });
-
-            // Create the UIElements.TextField that names a new DialogueCondition asset.
-            _conditionNameTextField = new TextField
-            {
-                name = "conditionNameTextField",
-                value = "New Condition"
-            };
-
-            // Create the UIElements.Button that will create a new DialogueCondition asset with the name in _conditionNameTextField 
-            _createConditionAssetButton = new Button(() => CreateConditionAsset(_conditionNameTextField.value))
-                {text = "New Condition"};
-        }
-
-        /// <summary>
-        /// Updates the form state based on a selected ConditionToTest.
-        /// </summary>
-        private void UpdateNodeFields()
-        {
-            VisualElement contentFoldoutContentContainer = _contentFoldout.contentContainer;
-            
-            // Update the title
-            title = ConditionToTest == null ? "Condition" : ConditionToTest.name;
-            
-            // Remove all children from the foldout in preparation for new state.
-            for (int i = contentFoldoutContentContainer.childCount - 1; i >= 0; i--)
-            {
-                contentFoldoutContentContainer.RemoveAt(i);
-            }
-
-            // Add the object field
-            contentFoldoutContentContainer.Add(_conditionObjectField);
-
-            // If there is no condition object set...
-            if (ConditionToTest == null)
-            {
-                // ... add the fields to create one, or...
-                contentFoldoutContentContainer.Add(_conditionNameTextField);
-                contentFoldoutContentContainer.Add(_createConditionAssetButton);
-            }
-            else
-            {
-                // ...add the field to toggle the condition's initial value.
-                contentFoldoutContentContainer.Add(_conditionObjectToggle);
-            }
-
-            // Refresh the node.
-            RefreshPorts();
-            RefreshExpandedState();
-        }
-
-        /// <summary>
-        /// Creates a new DialogueCondition in the Assets folder.
-        /// </summary>
-        /// <param name="assetName">The file name for the new asset.</param>
-        private void CreateConditionAsset(string assetName)
-        {
-            string assetPath = $"Assets/{assetName}.asset";
-            bool writeFile = true;
-            
-            // Check if the file already exists.
-            if (File.Exists(assetPath))
-            {
-                writeFile = EditorUtility.DisplayDialog(
-                    "Existing File Found",
-                    "A file with the same name already exists.Overwrite?",
-                    "Overwrite",
-                    "Cancel"
-                );
-            }
-
-            // If it isn't okay to write the file, exit early.
-            if (!writeFile) return;
-            
-            // Create the DialogueCondition asset.
-            DialogueCondition condition = CreateInstance<DialogueCondition>();
-            // Save the asset file.
-            AssetDatabase.CreateAsset(condition, assetPath);
-            
-            // Reset the text field and select the new DialogueCondition.
-            _conditionNameTextField.value = "New Condition";
-            _conditionObjectField.value = condition;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/ConditionNode.cs.meta b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/ConditionNode.cs.meta
deleted file mode 100644
index feedb56..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/ConditionNode.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: aa28bbe0c2fd469eb1f64664a1fe274d
-timeCreated: 1582158037
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/DialogueNode.cs b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/DialogueNode.cs
deleted file mode 100644
index 5afd16b..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/DialogueNode.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-using System;
-using System.Collections.Generic;
-using lastmilegames.DialogueSystem.NodeData;
-using UnityEditor.Experimental.GraphView;
-using UnityEngine;
-using UnityEngine.UIElements;
-
-/*
- * TODO: Note for building UI
- * If a DialogueNode has no ports OR if the port has no edges, display option to end conversation.
- */
-namespace lastmilegames.DialogueSystem.DialogueGraphEditor.Nodes
-{
-    /// <summary>
-    /// Represents a DialogueNode based off BaseNode.
-    /// </summary>
-    public class DialogueNode : BaseNode
-    {
-        /// <summary>
-        /// The text to display in the dialogue UI
-        /// </summary>
-        public string DialogueText { get; private set; }
-        
-        /// <summary>
-        /// The name of the speaker to display in the dialogue UI
-        /// </summary>
-        public string SpeakerName { get; private set; }
-        
-        /// <summary>
-        /// The DialogueNodePorts that represent possible responses.
-        /// </summary>
-        public List<DialogueNodePort> DialogueNodePorts { get; } = new List<DialogueNodePort>();
-
-        /// <summary>
-        /// Generates a new, default DialogueNode.
-        /// </summary>
-        /// <param name="onClickRemovePort">An action delegate called when the remove port button is clicked.</param>
-        public DialogueNode(Action<Node, Port> onClickRemovePort) : base(onClickRemovePort)
-        {
-            type = NodeType.Dialogue;
-            
-            // Associate stylesheet
-            styleSheets.Add(Resources.Load<StyleSheet>("Node"));
-
-            // Add node fields
-            BuildNodeControls();
-            UpdateTitle();
-        }
-
-        /// <summary>
-        /// Generates a new DialogueNode with pre-existing data.
-        /// </summary>
-        /// <param name="onClickRemovePort">An action delegate called when the remove port button is clicked.</param>
-        /// <param name="nodeData">The node data to populate the node with.</param>
-        public DialogueNode(Action<Node, Port> onClickRemovePort, DialogueNodeData nodeData) : base(onClickRemovePort)
-        {
-            type = NodeType.Dialogue;
-            
-            // Associate stylesheet
-            styleSheets.Add(Resources.Load<StyleSheet>("Node"));
-
-            // Set the properties from the passed in data.
-            Guid = nodeData.guid;
-            DialogueText = nodeData.dialogueText;
-            SpeakerName = nodeData.speakerName;
-
-            for (int i = 0; i < nodeData.responses.Count; i++)
-            {
-                AddDialogueNodePorts(nodeData.responses[i], nodeData.conditionsToToggle[i]);
-            }
-
-            // Add node fields
-            BuildNodeControls();
-            UpdateTitle();
-        }
-
-        /// <summary>
-        /// Builds the node UI.
-        /// </summary>
-        private void BuildNodeControls()
-        {
-            // An UIElements.Button that adds new DialogueNodePorts to the output container.
-            Button addChoiceButton = new Button(() => AddDialogueNodePorts()) {text = "Add Choice"};
-            titleButtonContainer.Add(addChoiceButton);
-
-            // The UIElements.Foldout that contains the main controls.
-            Foldout contentFoldout = new Foldout
-            {
-                text = "Dialogue Properties"
-            };
-            contentContainer.Add(contentFoldout);
-
-            // The UIElements.TextField that sets the speaker's name.
-            TextField speakerNameField = new TextField("Speaker Name")
-            {
-                value = SpeakerName
-            };
-            speakerNameField.RegisterValueChangedCallback(evt =>
-            {
-                SpeakerName = evt.newValue;
-                UpdateTitle();
-            });
-            contentFoldout.contentContainer.Add(speakerNameField);
-            
-            contentFoldout.contentContainer.Add(new VisualElement {name = "divider"});
-
-            // The UIElements.TextField that contains the speaker's dialogue
-            TextField dialogueTextField = new TextField("Dialogue Text") {value = DialogueText};
-            dialogueTextField.RegisterValueChangedCallback(evt =>
-            {
-                DialogueText = evt.newValue;
-                UpdateTitle();
-            });
-            dialogueTextField.multiline = true;
-            dialogueTextField.AddToClassList("dialogueTextField");
-            contentFoldout.contentContainer.Add(dialogueTextField);
-            
-            contentFoldout.contentContainer.Add(new VisualElement {name = "divider"});
-
-            RefreshExpandedState();
-            RefreshPorts();
-            SetPosition(new Rect(Vector2.zero, DefaultNodeSize));
-        }
-
-        // Adds an empty DialogueNodePort to the node's output container. 
-        private void AddDialogueNodePorts(string responseText = "", DialogueCondition condition = null)
-        {
-            DialogueNodePort dialogueNodePort = new DialogueNodePort(
-                GeneratePort(this, "Out", Direction.Output, type: typeof(string)),
-                onClickRemovePort,
-                responseText,
-                condition);
-
-            DialogueNodePorts.Add(dialogueNodePort);
-            outputContainer.Add(dialogueNodePort.Port);
-            RefreshExpandedState();
-            RefreshPorts();
-        }
-
-        /// <summary>
-        /// Updates the node's title when the form's state changes.
-        /// </summary>
-        public void UpdateTitle()
-        {
-            string speakerName;
-            if (string.IsNullOrWhiteSpace(SpeakerName))
-            {
-                speakerName = "NO-SPK";
-            }
-            else
-            {
-                speakerName = SpeakerName.Length <= 10
-                    ? SpeakerName
-                    : SpeakerName.Substring(0, 10) + "...";
-            }
-
-            string dialogueText;
-            if (string.IsNullOrWhiteSpace(DialogueText))
-            {
-                dialogueText = "NO-DLG";
-            }
-            else
-            {
-                dialogueText = DialogueText.Length <= 12
-                    ? DialogueText
-                    : DialogueText.Substring(0, 12) + "...";
-            }
-
-            title = $"{speakerName} : {dialogueText}";
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/DialogueNode.cs.meta b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/DialogueNode.cs.meta
deleted file mode 100644
index eeaa2f9..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/DialogueNode.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 4a0cce3773994928987b5f03cacd9910
-timeCreated: 1582157944
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/DialogueNodePort.cs b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/DialogueNodePort.cs
deleted file mode 100644
index f4aa24e..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/DialogueNodePort.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using System;
-using UnityEditor.Experimental.GraphView;
-using UnityEditor.UIElements;
-using UnityEngine.UIElements;
-
-namespace lastmilegames.DialogueSystem.DialogueGraphEditor.Nodes
-{
-    /// <summary>
-    /// A foldout that contains a TextField, ObjectField and GraphView.Port
-    /// </summary>
-    public class DialogueNodePort
-    {
-        /// <summary>
-        /// A reference to the output GraphView.Port 
-        /// </summary>
-        public Port Port { get; }
-        
-        /// <summary>
-        /// The ResponseText to display on the response buttons.
-        /// </summary>
-        public string ResponseText { get; set; }
-        
-        /// <summary>
-        /// The dialogue condition to toggle the value of when the choice is selected.
-        /// </summary>
-        public DialogueCondition ConditionToToggle { get; set; }
-
-        /// <summary>
-        /// Generates a default dialogue node port.
-        /// </summary>
-        /// <param name="port">A GraphView.Port to reference.</param>
-        /// <param name="onClickRemovePort">An action delegate that is called when the remove port button is clicked</param>
-        public DialogueNodePort(Port port, Action<Node, Port> onClickRemovePort)
-        {
-            Port = port;
-            
-            port.contentContainer.Add(GenerateDeleteButton(onClickRemovePort));
-            port.contentContainer.Add(GenerateFoldout());
-        }
-
-        public DialogueNodePort(Port port, Action<Node,Port> onClickRemovePort, string responseText = "", 
-            DialogueCondition condition = null)
-        {
-            Port = port;
-            ResponseText = responseText;
-            ConditionToToggle = condition;
-                        
-            port.contentContainer.Add(GenerateDeleteButton(onClickRemovePort));
-            port.contentContainer.Add(GenerateFoldout());
-        }
-
-        /// <summary>
-        /// Creates a new UIElements.Button for deleting a story choice.
-        /// </summary>
-        /// <param name="onClickRemovePort">The action delegate to be called when the delete button is pressed.</param>
-        /// <returns>Returns a UIElement.Button</returns>
-        private Button GenerateDeleteButton(Action<Node, Port> onClickRemovePort)
-        {
-            return new Button(() => onClickRemovePort(Port.node, Port))
-            {
-                text = "X",
-                tooltip = "Delete Choice"
-            };
-        }
-
-        /// <summary>
-        /// Creates a UIElements.Foldout and adds the DialogueNodePort elements.
-        /// </summary>
-        /// <returns>Returns a UIElements.Foldout with the DialogueNodePort fields.</returns>
-        private Foldout GenerateFoldout()
-        {
-            // The containing foldout
-            Foldout foldout = new Foldout
-            {
-                text = "Port Options",
-                name = "DialogueNodePort",
-                value = false
-            };
-
-            // The text to display on the response buttons in the game UI.
-            TextField choiceTextField = new TextField
-            {
-                name = "Response Text",
-                value = ResponseText
-            };
-            // Sets the ResponseText property to the value entered in the TextField.
-            choiceTextField.RegisterValueChangedCallback(evt => { ResponseText = evt.newValue; });
-            foldout.contentContainer.Add(choiceTextField);
-
-            // Sets the dialogue that needs to be toggled when the StoryChoice is chosen in the UI.
-            ObjectField dialogueToToggle = new ObjectField("Condition to Toggle")
-            {
-                name  = "ConditionToToggle",
-                objectType = typeof(DialogueCondition),
-                value = ConditionToToggle,
-                allowSceneObjects = false
-            };
-            dialogueToToggle.RegisterValueChangedCallback(evt =>
-            {
-                ConditionToToggle = evt.newValue as DialogueCondition;
-            });
-            foldout.contentContainer.Add(dialogueToToggle);
-            
-            return foldout;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/DialogueNodePort.cs.meta b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/DialogueNodePort.cs.meta
deleted file mode 100644
index 9823606..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/DialogueNodePort.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: b31d09a360a94ac1ba565b790d78af43
-timeCreated: 1582671863
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/EntryNode.cs b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/EntryNode.cs
deleted file mode 100644
index 1e4f4e8..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/EntryNode.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using lastmilegames.DialogueSystem.NodeData;
-using UnityEngine;
-
-namespace lastmilegames.DialogueSystem.DialogueGraphEditor.Nodes
-{
-    /// <summary>
-    /// Represents the empty starting point for each Dialogue.
-    /// </summary>
-    public class EntryNode : BaseNode
-    {
-        public EntryNode()
-        {
-            type = NodeType.Entry;
-            topContainer.Remove(inputContainer);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/EntryNode.cs.meta b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/EntryNode.cs.meta
deleted file mode 100644
index 42154da..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Nodes/EntryNode.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 8aa25270e41c40c29848a37090345ef4
-timeCreated: 1582309983
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Resources.meta b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Resources.meta
deleted file mode 100644
index bf2f64f..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Resources.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 4d7e9a6594e34e548cba90b92ce27b2e
-timeCreated: 1582129998
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Resources/DialogueGraph.uss b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Resources/DialogueGraph.uss
deleted file mode 100644
index b623b3f..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Resources/DialogueGraph.uss
+++ /dev/null
@@ -1,10 +0,0 @@
-DialogueGraphView {
-    background-color: #202020;
-}
-
-GridBackground {
-    /*--grid-background-color: #282828;*/
-    --line-color: rgba(193, 196, 192, 0.1);
-    --thick-line-color: rgba(193, 196, 192, 0.1);
-    --spacing: 10;
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Resources/DialogueGraph.uss.meta b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Resources/DialogueGraph.uss.meta
deleted file mode 100644
index 601ab2a..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Resources/DialogueGraph.uss.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 25253752fe8f4473b092386e7ca019f8
-timeCreated: 1582130022
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Resources/Node.uss b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Resources/Node.uss
deleted file mode 100644
index 6f6c441..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Resources/Node.uss
+++ /dev/null
@@ -1,55 +0,0 @@
-DialogueNode {
-    min-width: 250px;
-}
-
-DialogueNode #unity-content,
-ConditionNode #condition-properties-foldout #unity-content{
-    margin-left: 0;
-}
-
-DialogueNode #output Port {
-    height: auto;
-}
-
-DialogueNode #output Port Foldout {
-    flex-grow: 1;
-}
-
-DialogueNode #output .unity-base-field{
-    max-width: 200px;
-    max-height: none;
-    white-space: normal;
-}
-
-DialogueNode .dialogueTextField TextInput{
-    max-width: 300px;
-}
-
-ConditionNode ObjectField {
-    width: 200px;
-}
-
-ConditionNode ObjectField Label {
-    padding-bottom: 5px;
-}
-
-ConditionNode Toggle Label{
-    flex-grow: 1;
-}
-
-TextField, ObjectField {
-    flex-direction: column;
-}
-
-TextField, ObjectField, Toggle {
-    background-color: #3a3a3a;
-    padding: 5px;
-}
-
-#unity-text-input {
-    white-space: normal;
-}
-
-/*Port.port {*/
-/*    height: auto;*/
-/*}*/
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Resources/Node.uss.meta b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Resources/Node.uss.meta
deleted file mode 100644
index 61ff47a..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Resources/Node.uss.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 2b012a5a7f1540a68493ad4494092493
-timeCreated: 1582130022
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Resources/Toolbar.uss b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Resources/Toolbar.uss
deleted file mode 100644
index 954b8c8..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Resources/Toolbar.uss
+++ /dev/null
@@ -1,19 +0,0 @@
-.unity-toolbar {
-    background-color: #2a2a2a;
-}
-
-.unity-toolbar-button, .unity-toolbar-toggle {
-    background-color: rgba(0, 0, 0, 0);
-    color: #c4c4c4;
-}
-
-.unity-toolbar .unity-base-text-field__input {
-    border-top-color: #c4c4c4;
-    border-right-color: #c4c4c4;
-    border-bottom-color: #c4c4c4;
-    border-left-color: #c4c4c4;
-}
-
-.unity-toolbar-button:hover, .unity-toolbar-toggle:hover {
-    background-color: #4d4d4d;
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Resources/Toolbar.uss.meta b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Resources/Toolbar.uss.meta
deleted file mode 100644
index 01a8914..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/Resources/Toolbar.uss.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: e9549018e95e46909858d617cae5482c
-timeCreated: 1582139223
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/SearchWindowProvider.cs b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/SearchWindowProvider.cs
deleted file mode 100644
index baa5489..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/SearchWindowProvider.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System.Collections.Generic;
-using lastmilegames.DialogueSystem.NodeData;
-using UnityEditor;
-using UnityEditor.Experimental.GraphView;
-using UnityEngine;
-using UnityEngine.UIElements;
-
-namespace lastmilegames.DialogueSystem.DialogueGraphEditor
-{
-    public class SearchWindowProvider : ScriptableObject, ISearchWindowProvider
-    {
-        private DialogueGraphView _graphView;
-        private EditorWindow _editorWindow;
-        private Texture2D _indentationIcon; // Icon for indentation hack 
-
-        public void Init(EditorWindow editorWindow, DialogueGraphView graphView)
-        {
-            _graphView = graphView;
-            _editorWindow = editorWindow;
-
-            // Transparent icon to fix indentation in search window groups
-            _indentationIcon = new Texture2D(1, 1);
-            _indentationIcon.SetPixel(0, 0, new Color(0, 0, 0, 0));
-            _indentationIcon.Apply();
-        }
-
-        public List<SearchTreeEntry> CreateSearchTree(SearchWindowContext context)
-        {
-            List<SearchTreeEntry> tree = new List<SearchTreeEntry>
-            {
-                new SearchTreeGroupEntry(new GUIContent("Add Nodes")),
-                // Un-comment the line below to create a group
-                // new SearchTreeGroupEntry(new GUIContent("Content"), 1),
-                new SearchTreeEntry(new GUIContent("Dialogue", _indentationIcon))
-                {
-                    level = 1,
-                    userData = NodeType.Dialogue
-                },
-                new SearchTreeEntry(new GUIContent("Condition", _indentationIcon))
-                {
-                    level = 1,
-                    userData = NodeType.Condition
-                }
-            };
-
-            return tree;
-        }
-
-        public bool OnSelectEntry(SearchTreeEntry searchTreeEntry, SearchWindowContext context)
-        {
-            Vector2 worldMousePosition = _editorWindow.rootVisualElement.ChangeCoordinatesTo(
-                _editorWindow.rootVisualElement.parent,
-                context.screenMousePosition - _editorWindow.position.position
-            );
-
-            Vector2 localMousePosition = _graphView.contentViewContainer.WorldToLocal(worldMousePosition);
-
-            switch (searchTreeEntry.userData)
-            {
-                case NodeType.Dialogue:
-                    _graphView.CreateNode(NodeType.Dialogue, localMousePosition);
-                    return true;
-                case NodeType.Condition:
-                    _graphView.CreateNode(NodeType.Condition, localMousePosition);
-                    return true;
-                default:
-                    return false;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/SearchWindowProvider.cs.meta b/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/SearchWindowProvider.cs.meta
deleted file mode 100644
index 7a2cb13..0000000
--- a/Assets/DialogueSystem/Scripts/Editor/DialogueGraphEditor/SearchWindowProvider.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 36feb5893f1d4d61882826c4b32f1c69
-timeCreated: 1584831253
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/IDialoguePlayer.cs b/Assets/DialogueSystem/Scripts/IDialoguePlayer.cs
deleted file mode 100644
index ae4f2e4..0000000
--- a/Assets/DialogueSystem/Scripts/IDialoguePlayer.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace lastmilegames.DialogueSystem
-{
-    public interface IDialoguePlayer
-    {
-        void PlayDialogue(DialogueContainer container);
-    }
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/IDialoguePlayer.cs.meta b/Assets/DialogueSystem/Scripts/IDialoguePlayer.cs.meta
deleted file mode 100644
index 71f268e..0000000
--- a/Assets/DialogueSystem/Scripts/IDialoguePlayer.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 68ab8c9f7a9a4556891473e53c6dd639
-timeCreated: 1604013675
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/NodeData.meta b/Assets/DialogueSystem/Scripts/NodeData.meta
deleted file mode 100644
index 5accac6..0000000
--- a/Assets/DialogueSystem/Scripts/NodeData.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 6fe4dff7781f4eee988c2c4427c5d7a1
-timeCreated: 1604008777
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/NodeData/BaseNodeData.cs b/Assets/DialogueSystem/Scripts/NodeData/BaseNodeData.cs
deleted file mode 100644
index f9c487c..0000000
--- a/Assets/DialogueSystem/Scripts/NodeData/BaseNodeData.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using UnityEngine;
-
-namespace lastmilegames.DialogueSystem.NodeData
-{
-    /// <summary>
-    /// Base class for serializable node data. Represents the data all nodes should track.
-    /// </summary>
-    [Serializable]
-    public class BaseNodeData
-    {
-        public string guid;
-        public Vector2 position;
-        public NodeType type;
-    }
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/NodeData/BaseNodeData.cs.meta b/Assets/DialogueSystem/Scripts/NodeData/BaseNodeData.cs.meta
deleted file mode 100644
index daca11f..0000000
--- a/Assets/DialogueSystem/Scripts/NodeData/BaseNodeData.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 7d52fa10526b4aff9e689bd3d93408ca
-timeCreated: 1582908255
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/NodeData/ConditionNodeData.cs b/Assets/DialogueSystem/Scripts/NodeData/ConditionNodeData.cs
deleted file mode 100644
index a9bb394..0000000
--- a/Assets/DialogueSystem/Scripts/NodeData/ConditionNodeData.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-
-namespace lastmilegames.DialogueSystem.NodeData
-{
-    /// <summary>
-    /// Represents the data that a ConditionNode should save.
-    /// </summary>
-    [Serializable]
-    public class ConditionNodeData : BaseNodeData
-    {
-        public DialogueCondition conditionToTest;
-    }
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/NodeData/ConditionNodeData.cs.meta b/Assets/DialogueSystem/Scripts/NodeData/ConditionNodeData.cs.meta
deleted file mode 100644
index f20a93d..0000000
--- a/Assets/DialogueSystem/Scripts/NodeData/ConditionNodeData.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: c761ff45aac34fdca503dacc2382e959
-timeCreated: 1582742605
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/NodeData/DialogueNodeData.cs b/Assets/DialogueSystem/Scripts/NodeData/DialogueNodeData.cs
deleted file mode 100644
index 2a0e70f..0000000
--- a/Assets/DialogueSystem/Scripts/NodeData/DialogueNodeData.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace lastmilegames.DialogueSystem.NodeData
-{
-    /// <summary>
-    /// Represents the data a DialogueNode should track.
-    /// </summary>
-    [Serializable]
-    public class DialogueNodeData : BaseNodeData
-    {
-        /// <summary>
-        /// The spoken dialogue.
-        /// </summary>
-        public string dialogueText;
-        
-        /// <summary>
-        /// The speaker.
-        /// </summary>
-        public string speakerName;
-
-        /// <summary>
-        /// A list of the DialogueNodePort responses.
-        /// </summary>
-        public List<string> responses;
-
-        /// <summary>
-        /// A list of the DialogueNodePort conditions to toggle.
-        /// </summary>
-        public List<DialogueCondition> conditionsToToggle;
-    }
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/NodeData/DialogueNodeData.cs.meta b/Assets/DialogueSystem/Scripts/NodeData/DialogueNodeData.cs.meta
deleted file mode 100644
index 65ac3d3..0000000
--- a/Assets/DialogueSystem/Scripts/NodeData/DialogueNodeData.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 7a70e63dae024bf692c7b288cc706479
-timeCreated: 1582742556
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/NodeData/ExposedProperty.cs b/Assets/DialogueSystem/Scripts/NodeData/ExposedProperty.cs
deleted file mode 100644
index 4b16278..0000000
--- a/Assets/DialogueSystem/Scripts/NodeData/ExposedProperty.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace lastmilegames.DialogueSystem.NodeData
-{
-    [Serializable]
-    public class ExposedProperty
-    {
-        public string propertyName = "@@NAME@@";
-        public string propertyValue = "Value";
-    }
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/NodeData/ExposedProperty.cs.meta b/Assets/DialogueSystem/Scripts/NodeData/ExposedProperty.cs.meta
deleted file mode 100644
index 1581b4a..0000000
--- a/Assets/DialogueSystem/Scripts/NodeData/ExposedProperty.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: b38799781c8c46e5a3cd0808a4b8e332
-timeCreated: 1604353132
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/NodeData/NodeLinkData.cs b/Assets/DialogueSystem/Scripts/NodeData/NodeLinkData.cs
deleted file mode 100644
index b48069e..0000000
--- a/Assets/DialogueSystem/Scripts/NodeData/NodeLinkData.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-
-namespace lastmilegames.DialogueSystem.NodeData
-{
-    /// <summary>
-    /// Represents the links between nodes.
-    /// </summary>
-    [Serializable]
-    public class NodeLinkData
-    {
-        /// <summary>
-        /// The output node that starts the link.
-        /// </summary>
-        public string baseNodeGuid;
-
-        /// <summary>
-        /// The type of the output node that starts the link.
-        /// </summary>
-        public NodeType baseNodeType;
-
-        /// <summary>
-        /// The next node to move to.
-        /// </summary>
-        public string targetNodeGuid;
-
-        /// <summary>
-        /// The type of the final node in the link.
-        /// </summary>
-        public NodeType targetNodeType;
-    }
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/NodeData/NodeLinkData.cs.meta b/Assets/DialogueSystem/Scripts/NodeData/NodeLinkData.cs.meta
deleted file mode 100644
index 642fb36..0000000
--- a/Assets/DialogueSystem/Scripts/NodeData/NodeLinkData.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: f769806a40a6470cb7355cb17e5a359c
-timeCreated: 1582742667
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/NodeData/NodeType.cs b/Assets/DialogueSystem/Scripts/NodeData/NodeType.cs
deleted file mode 100644
index 5feb09f..0000000
--- a/Assets/DialogueSystem/Scripts/NodeData/NodeType.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace lastmilegames.DialogueSystem.NodeData
-{
-    /// <summary>
-    /// The available types of nodes that can be created.
-    /// </summary>
-    public enum NodeType
-    {
-        NotSet,
-        Entry,
-        Condition,
-        Dialogue
-    }
-}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/NodeData/NodeType.cs.meta b/Assets/DialogueSystem/Scripts/NodeData/NodeType.cs.meta
deleted file mode 100644
index 025bdc8..0000000
--- a/Assets/DialogueSystem/Scripts/NodeData/NodeType.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 9b1d5acf821c47d6b46199e15670eb15
-timeCreated: 1582158115
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Utilities.meta b/Assets/DialogueSystem/Scripts/Utilities.meta
new file mode 100644
index 0000000..25f5806
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Utilities.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: bdbfba90d93e4732aa1e7e107d18b071
+timeCreated: 1607531053
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Utilities/VisualElementExtensions.cs b/Assets/DialogueSystem/Scripts/Utilities/VisualElementExtensions.cs
new file mode 100644
index 0000000..8c501a7
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Utilities/VisualElementExtensions.cs
@@ -0,0 +1,12 @@
+using UnityEngine.UIElements;
+
+namespace lastmilegames.DialogueSystem.Utilities
+{
+    public static class VisualElementExtensions
+    {
+        public static void ToggleFieldVisibility(this VisualElement field, bool condition)
+        {
+            field.style.display = condition ? DisplayStyle.Flex : DisplayStyle.None;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/DialogueSystem/Scripts/Utilities/VisualElementExtensions.cs.meta b/Assets/DialogueSystem/Scripts/Utilities/VisualElementExtensions.cs.meta
new file mode 100644
index 0000000..6a5bdcc
--- /dev/null
+++ b/Assets/DialogueSystem/Scripts/Utilities/VisualElementExtensions.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5fed4d878a064d72ba30badf9a2d2663
+timeCreated: 1607530838
\ No newline at end of file
diff --git a/UIElementsSchema/UIElements.xsd b/UIElementsSchema/UIElements.xsd
index 12afeab..47e030e 100644
--- a/UIElementsSchema/UIElements.xsd
+++ b/UIElementsSchema/UIElements.xsd
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.UIElements.Debugger" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Rendering.LookDev" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:import schemaLocation="UnityEditor.PackageManager.UI.xsd" namespace="UnityEditor.PackageManager.UI" />
   <xs:import schemaLocation="UnityEditor.UIElements.xsd" namespace="UnityEditor.UIElements" />
   <xs:import schemaLocation="UnityEditor.UIElements.Debugger.xsd" namespace="UnityEditor.UIElements.Debugger" />
+  <xs:import schemaLocation="UnityEditor.ShaderGraph.Drawing.xsd" namespace="UnityEditor.ShaderGraph.Drawing" />
+  <xs:import schemaLocation="UnityEditor.Rendering.LookDev.xsd" namespace="UnityEditor.Rendering.LookDev" />
 </xs:schema>
\ No newline at end of file
diff --git a/UIElementsSchema/UnityEditor.PackageManager.UI.xsd b/UIElementsSchema/UnityEditor.PackageManager.UI.xsd
index 2e1a9e6..ee80541 100644
--- a/UIElementsSchema/UnityEditor.PackageManager.UI.xsd
+++ b/UIElementsSchema/UnityEditor.PackageManager.UI.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.UIElements.Debugger" elementFormDefault="qualified" targetNamespace="UnityEditor.PackageManager.UI" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Rendering.LookDev" elementFormDefault="qualified" targetNamespace="UnityEditor.PackageManager.UI" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:complexType name="AlertType">
     <xs:complexContent mixed="false">
@@ -125,7 +125,7 @@
     </xs:complexContent>
   </xs:complexType>
   <xs:element name="PackageDetails" substitutionGroup="engine:VisualElement" xmlns:q6="UnityEditor.PackageManager.UI" type="q6:PackageDetailsType" />
-  <xs:complexType name="PackageItemType">
+  <xs:complexType name="PackageListType">
     <xs:complexContent mixed="false">
       <xs:restriction base="engine:VisualElementType">
         <xs:sequence minOccurs="0" maxOccurs="unbounded">
@@ -145,8 +145,8 @@
       </xs:restriction>
     </xs:complexContent>
   </xs:complexType>
-  <xs:element name="PackageItem" substitutionGroup="engine:VisualElement" xmlns:q7="UnityEditor.PackageManager.UI" type="q7:PackageItemType" />
-  <xs:complexType name="PackageListType">
+  <xs:element name="PackageList" substitutionGroup="engine:VisualElement" xmlns:q7="UnityEditor.PackageManager.UI" type="q7:PackageListType" />
+  <xs:complexType name="PackageManagerToolbarType">
     <xs:complexContent mixed="false">
       <xs:restriction base="engine:VisualElementType">
         <xs:sequence minOccurs="0" maxOccurs="unbounded">
@@ -166,8 +166,8 @@
       </xs:restriction>
     </xs:complexContent>
   </xs:complexType>
-  <xs:element name="PackageList" substitutionGroup="engine:VisualElement" xmlns:q8="UnityEditor.PackageManager.UI" type="q8:PackageListType" />
-  <xs:complexType name="PackageManagerToolbarType">
+  <xs:element name="PackageManagerToolbar" substitutionGroup="engine:VisualElement" xmlns:q8="UnityEditor.PackageManager.UI" type="q8:PackageManagerToolbarType" />
+  <xs:complexType name="PackageSampleListType">
     <xs:complexContent mixed="false">
       <xs:restriction base="engine:VisualElementType">
         <xs:sequence minOccurs="0" maxOccurs="unbounded">
@@ -187,8 +187,8 @@
       </xs:restriction>
     </xs:complexContent>
   </xs:complexType>
-  <xs:element name="PackageManagerToolbar" substitutionGroup="engine:VisualElement" xmlns:q9="UnityEditor.PackageManager.UI" type="q9:PackageManagerToolbarType" />
-  <xs:complexType name="PackageSampleListType">
+  <xs:element name="PackageSampleList" substitutionGroup="engine:VisualElement" xmlns:q9="UnityEditor.PackageManager.UI" type="q9:PackageSampleListType" />
+  <xs:complexType name="PackageStatusBarType">
     <xs:complexContent mixed="false">
       <xs:restriction base="engine:VisualElementType">
         <xs:sequence minOccurs="0" maxOccurs="unbounded">
@@ -208,8 +208,8 @@
       </xs:restriction>
     </xs:complexContent>
   </xs:complexType>
-  <xs:element name="PackageSampleList" substitutionGroup="engine:VisualElement" xmlns:q10="UnityEditor.PackageManager.UI" type="q10:PackageSampleListType" />
-  <xs:complexType name="PackageStatusBarType">
+  <xs:element name="PackageStatusBar" substitutionGroup="engine:VisualElement" xmlns:q10="UnityEditor.PackageManager.UI" type="q10:PackageStatusBarType" />
+  <xs:complexType name="PackageToolbarType">
     <xs:complexContent mixed="false">
       <xs:restriction base="engine:VisualElementType">
         <xs:sequence minOccurs="0" maxOccurs="unbounded">
@@ -229,8 +229,8 @@
       </xs:restriction>
     </xs:complexContent>
   </xs:complexType>
-  <xs:element name="PackageStatusBar" substitutionGroup="engine:VisualElement" xmlns:q11="UnityEditor.PackageManager.UI" type="q11:PackageStatusBarType" />
-  <xs:complexType name="PackageToolbarType">
+  <xs:element name="PackageToolbar" substitutionGroup="engine:VisualElement" xmlns:q11="UnityEditor.PackageManager.UI" type="q11:PackageToolbarType" />
+  <xs:complexType name="ProgressBarType">
     <xs:complexContent mixed="false">
       <xs:restriction base="engine:VisualElementType">
         <xs:sequence minOccurs="0" maxOccurs="unbounded">
@@ -250,13 +250,10 @@
       </xs:restriction>
     </xs:complexContent>
   </xs:complexType>
-  <xs:element name="PackageToolbar" substitutionGroup="engine:VisualElement" xmlns:q12="UnityEditor.PackageManager.UI" type="q12:PackageToolbarType" />
-  <xs:complexType name="ProgressBarType">
+  <xs:element name="ProgressBar" substitutionGroup="engine:VisualElement" xmlns:q12="UnityEditor.PackageManager.UI" type="q12:ProgressBarType" />
+  <xs:complexType name="SplitViewType">
     <xs:complexContent mixed="false">
       <xs:restriction base="engine:VisualElementType">
-        <xs:sequence minOccurs="0" maxOccurs="unbounded">
-          <xs:element ref="engine:VisualElement" />
-        </xs:sequence>
         <xs:attribute default="" name="name" type="xs:string" use="optional" />
         <xs:attribute default="" name="view-data-key" type="xs:string" use="optional" />
         <xs:attribute default="Position" name="picking-mode" type="engine:VisualElement_picking-mode_Type" use="optional" />
@@ -267,14 +264,18 @@
         <xs:attribute default="" name="class" type="xs:string" use="optional" />
         <xs:attribute default="" name="content-container" type="xs:string" use="optional" />
         <xs:attribute default="" name="style" type="xs:string" use="optional" />
+        <xs:attribute default="100" name="fixed-pane-initial-size" type="xs:int" use="optional" />
         <xs:anyAttribute processContents="lax" />
       </xs:restriction>
     </xs:complexContent>
   </xs:complexType>
-  <xs:element name="ProgressBar" substitutionGroup="engine:VisualElement" xmlns:q13="UnityEditor.PackageManager.UI" type="q13:ProgressBarType" />
-  <xs:complexType name="SplitViewType">
+  <xs:element name="SplitView" substitutionGroup="engine:VisualElement" xmlns:q13="UnityEditor.PackageManager.UI" type="q13:SplitViewType" />
+  <xs:complexType name="ScopedRegistriesSettingsType">
     <xs:complexContent mixed="false">
       <xs:restriction base="engine:VisualElementType">
+        <xs:sequence minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="engine:VisualElement" />
+        </xs:sequence>
         <xs:attribute default="" name="name" type="xs:string" use="optional" />
         <xs:attribute default="" name="view-data-key" type="xs:string" use="optional" />
         <xs:attribute default="Position" name="picking-mode" type="engine:VisualElement_picking-mode_Type" use="optional" />
@@ -285,10 +286,9 @@
         <xs:attribute default="" name="class" type="xs:string" use="optional" />
         <xs:attribute default="" name="content-container" type="xs:string" use="optional" />
         <xs:attribute default="" name="style" type="xs:string" use="optional" />
-        <xs:attribute default="100" name="fixed-pane-initial-size" type="xs:int" use="optional" />
         <xs:anyAttribute processContents="lax" />
       </xs:restriction>
     </xs:complexContent>
   </xs:complexType>
-  <xs:element name="SplitView" substitutionGroup="engine:VisualElement" xmlns:q14="UnityEditor.PackageManager.UI" type="q14:SplitViewType" />
+  <xs:element name="ScopedRegistriesSettings" substitutionGroup="engine:VisualElement" xmlns:q14="UnityEditor.PackageManager.UI" type="q14:ScopedRegistriesSettingsType" />
 </xs:schema>
\ No newline at end of file
diff --git a/UIElementsSchema/UnityEditor.Rendering.LookDev.xsd b/UIElementsSchema/UnityEditor.Rendering.LookDev.xsd
new file mode 100644
index 0000000..a3799a3
--- /dev/null
+++ b/UIElementsSchema/UnityEditor.Rendering.LookDev.xsd
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Rendering.LookDev" elementFormDefault="qualified" targetNamespace="UnityEditor.Rendering.LookDev" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
+  <xs:complexType name="ToolbarRadioType">
+    <xs:complexContent mixed="false">
+      <xs:restriction base="engine:VisualElementType">
+        <xs:attribute default="" name="name" type="xs:string" use="optional" />
+        <xs:attribute default="" name="view-data-key" type="xs:string" use="optional" />
+        <xs:attribute default="Position" name="picking-mode" type="engine:VisualElement_picking-mode_Type" use="optional" />
+        <xs:attribute default="" name="tooltip" type="xs:string" use="optional" />
+        <xs:attribute default="None" name="usage-hints" type="engine:VisualElement_usage-hints_Type" use="optional" />
+        <xs:attribute default="0" name="tabindex" type="xs:int" use="optional" />
+        <xs:attribute default="false" name="focusable" type="xs:boolean" use="optional" />
+        <xs:attribute default="" name="class" type="xs:string" use="optional" />
+        <xs:attribute default="" name="content-container" type="xs:string" use="optional" />
+        <xs:attribute default="" name="style" type="xs:string" use="optional" />
+        <xs:attribute default="" name="binding-path" type="xs:string" use="optional" />
+        <xs:attribute default="" name="text" type="xs:string" use="optional" />
+        <xs:anyAttribute processContents="lax" />
+      </xs:restriction>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:element name="ToolbarRadio" substitutionGroup="engine:VisualElement" type="ToolbarRadioType" />
+  <xs:complexType name="MultipleDifferentValueType">
+    <xs:complexContent mixed="false">
+      <xs:restriction base="engine:VisualElementType">
+        <xs:attribute default="" name="name" type="xs:string" use="optional" />
+        <xs:attribute default="" name="view-data-key" type="xs:string" use="optional" />
+        <xs:attribute default="Position" name="picking-mode" type="engine:VisualElement_picking-mode_Type" use="optional" />
+        <xs:attribute default="" name="tooltip" type="xs:string" use="optional" />
+        <xs:attribute default="None" name="usage-hints" type="engine:VisualElement_usage-hints_Type" use="optional" />
+        <xs:attribute default="0" name="tabindex" type="xs:int" use="optional" />
+        <xs:attribute default="false" name="focusable" type="xs:boolean" use="optional" />
+        <xs:attribute default="" name="class" type="xs:string" use="optional" />
+        <xs:attribute default="" name="content-container" type="xs:string" use="optional" />
+        <xs:attribute default="" name="style" type="xs:string" use="optional" />
+        <xs:attribute default="" name="binding-path" type="xs:string" use="optional" />
+        <xs:attribute default="" name="text" type="xs:string" use="optional" />
+        <xs:anyAttribute processContents="lax" />
+      </xs:restriction>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:element name="MultipleDifferentValue" substitutionGroup="engine:VisualElement" type="MultipleDifferentValueType" />
+</xs:schema>
\ No newline at end of file
diff --git a/UIElementsSchema/UnityEditor.ShaderGraph.Drawing.xsd b/UIElementsSchema/UnityEditor.ShaderGraph.Drawing.xsd
new file mode 100644
index 0000000..a37150f
--- /dev/null
+++ b/UIElementsSchema/UnityEditor.ShaderGraph.Drawing.xsd
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Rendering.LookDev" elementFormDefault="qualified" targetNamespace="UnityEditor.ShaderGraph.Drawing" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
+  <xs:complexType name="ResizableElementType">
+    <xs:complexContent mixed="false">
+      <xs:restriction base="engine:VisualElementType">
+        <xs:sequence minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="engine:VisualElement" />
+        </xs:sequence>
+        <xs:attribute default="" name="name" type="xs:string" use="optional" />
+        <xs:attribute default="" name="view-data-key" type="xs:string" use="optional" />
+        <xs:attribute default="Position" name="picking-mode" type="engine:VisualElement_picking-mode_Type" use="optional" />
+        <xs:attribute default="" name="tooltip" type="xs:string" use="optional" />
+        <xs:attribute default="None" name="usage-hints" type="engine:VisualElement_usage-hints_Type" use="optional" />
+        <xs:attribute default="0" name="tabindex" type="xs:int" use="optional" />
+        <xs:attribute default="false" name="focusable" type="xs:boolean" use="optional" />
+        <xs:attribute default="" name="class" type="xs:string" use="optional" />
+        <xs:attribute default="" name="content-container" type="xs:string" use="optional" />
+        <xs:attribute default="" name="style" type="xs:string" use="optional" />
+        <xs:anyAttribute processContents="lax" />
+      </xs:restriction>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:element name="ResizableElement" substitutionGroup="engine:VisualElement" xmlns:q1="UnityEditor.ShaderGraph.Drawing" type="q1:ResizableElementType" />
+</xs:schema>
\ No newline at end of file
diff --git a/UIElementsSchema/UnityEditor.UIElements.Debugger.xsd b/UIElementsSchema/UnityEditor.UIElements.Debugger.xsd
index 27c2132..3c58a62 100644
--- a/UIElementsSchema/UnityEditor.UIElements.Debugger.xsd
+++ b/UIElementsSchema/UnityEditor.UIElements.Debugger.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.UIElements.Debugger" elementFormDefault="qualified" targetNamespace="UnityEditor.UIElements.Debugger" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Rendering.LookDev" elementFormDefault="qualified" targetNamespace="UnityEditor.UIElements.Debugger" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:complexType name="EventTypeSelectFieldType">
     <xs:complexContent mixed="false">
@@ -23,5 +23,5 @@
       </xs:restriction>
     </xs:complexContent>
   </xs:complexType>
-  <xs:element name="EventTypeSelectField" substitutionGroup="engine:VisualElement" type="EventTypeSelectFieldType" />
+  <xs:element name="EventTypeSelectField" substitutionGroup="engine:VisualElement" xmlns:q1="UnityEditor.UIElements.Debugger" type="q1:EventTypeSelectFieldType" />
 </xs:schema>
\ No newline at end of file
diff --git a/UIElementsSchema/UnityEditor.UIElements.xsd b/UIElementsSchema/UnityEditor.UIElements.xsd
index 4d59d30..093c839 100644
--- a/UIElementsSchema/UnityEditor.UIElements.xsd
+++ b/UIElementsSchema/UnityEditor.UIElements.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.UIElements.Debugger" elementFormDefault="qualified" targetNamespace="UnityEditor.UIElements" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Rendering.LookDev" elementFormDefault="qualified" targetNamespace="UnityEditor.UIElements" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:simpleType name="PropertyControl_value-type_Type">
     <xs:restriction base="xs:string">
diff --git a/UIElementsSchema/UnityEngine.UIElements.xsd b/UIElementsSchema/UnityEngine.UIElements.xsd
index ac366ff..cc966e1 100644
--- a/UIElementsSchema/UnityEngine.UIElements.xsd
+++ b/UIElementsSchema/UnityEngine.UIElements.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.UIElements.Debugger" elementFormDefault="qualified" targetNamespace="UnityEngine.UIElements" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Rendering.LookDev" elementFormDefault="qualified" targetNamespace="UnityEngine.UIElements" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:complexType name="UXMLType">
     <xs:complexContent mixed="false">
       <xs:restriction base="xs:anyType">