diff --git a/Preloader.hx b/Preloader.hx
deleted file mode 100644
index c979c9c7..00000000
--- a/Preloader.hx
+++ /dev/null
@@ -1,57 +0,0 @@
-package ;
- 
-import flixel.system.FlxBasePreloader;
-import openfl.display.Sprite;
-import flash.display.Bitmap;
-import flash.display.BitmapData;
-import flash.display.BlendMode;
-import flash.display.Sprite;
-import flash.Lib;
-import flixel.FlxG;
- 
-@:bitmap("art/preloaderArt.png") class LogoImage extends BitmapData { }
- 
-class Preloader extends FlxBasePreloader
-{
-    public function new(MinDisplayTime:Float=3, ?AllowedURLs:Array<String>) 
-    {
-        super(MinDisplayTime, AllowedURLs);
-    }
-     
-    var logo:Sprite;
-     
-    override function create():Void 
-    {
-        this._width = Lib.current.stage.stageWidth;
-        this._height = Lib.current.stage.stageHeight;
-         
-        var ratio:Float = this._width / 2560; //This allows us to scale assets depending on the size of the screen.
-         
-        logo = new Sprite();
-        logo.addChild(new Bitmap(new LogoImage(0,0))); //Sets the graphic of the sprite to a Bitmap object, which uses our embedded BitmapData class.
-        logo.scaleX = logo.scaleY = ratio;
-        logo.x = ((this._width) / 2) - ((logo.width) / 2);
-        logo.y = (this._height / 2) - ((logo.height) / 2);
-        addChild(logo); //Adds the graphic to the NMEPreloader's buffer.
-         
-        super.create();
-    }
-     
-    override function update(Percent:Float):Void 
-    {
-        if(Percent < 69)
-        {
-            logo.scaleX += Percent / 1920;
-            logo.scaleY += Percent / 1920;
-            logo.x -= Percent * 0.6;
-            logo.y -= Percent / 2;
-        }else{
-            logo.scaleX = this._width / 1280;
-            logo.scaleY = this._width / 1280;
-            logo.x = ((this._width) / 2) - ((logo.width) / 2);
-            logo.y = (this._height / 2) - ((logo.height) / 2);
-        }
-        
-        super.update(Percent);
-    }
-}
\ No newline at end of file
diff --git a/Project.xml b/Project.xml
index 502afa7d..8d4960f2 100644
--- a/Project.xml
+++ b/Project.xml
@@ -43,7 +43,7 @@
 	<!-- ____________________________ Window Settings ___________________________ -->
 	<!-- These window settings apply to all targets -->
 	<window width="1280" height="720" fps="60" background="#000000" hardware="true" vsync="false" />
-	<window antialiasing="0" allow-high-dpi="true"/>
+	<window antialiasing="0" allow-high-dpi="true" />
 	<!-- HTML5-specific -->
 	<window if="html5" resizable="true" />
 	<!-- Desktop-specific -->
@@ -114,7 +114,6 @@
 	<haxedef name="haxeui_allow_drag_any_component" value="true" />
 	<haxedef name="haxeui_flixel_no_custom_cursors" value="true" />
 	<haxedef name="haxeui_dont_impose_base_class" value="true" />
-	<haxedef name="openfl_enable_experimental_update_queue"/>
 	<section if="COMPILE_ALL_CLASSES">
 		<haxeflag name="-dce" value="no" />
 		<haxeflag name="--macro" value="ClassMacro.addAdditionalClasses()" />
@@ -126,7 +125,6 @@
 	</section>
 	<!-- Basically Allows Videos To Render In Higher Quality On Higher Resoluttions -->
 	<haxedef name="openfl_dpi_aware" unless="web" />
-	
 	<haxedef name="haxeui_focus_out_on_click" />
 	<!-- Tired Of HaxeUI Breaking Things -->
 	<haxeflag name="--macro" value="include('haxe.ui.backend.flixel.components')" />
diff --git a/assets/shared/data/editors/charter.xml b/assets/shared/data/editors/charter.xml
index 7f81a750..71f4942a 100644
--- a/assets/shared/data/editors/charter.xml
+++ b/assets/shared/data/editors/charter.xml
@@ -10,12 +10,13 @@
 		<menu text="Chart" style="padding: 5px;">
 			<menu-item id="chartSave" text="Save Chart" />
 			<menu-item id="chartReload" text="Reload Chart" />
+			<!--
 			<menu-item id="chartLoadAuto" text="Load Autosave" />
 			<menu-item id="chartClear" text="Clear Chart" />
+			-->
 		</menu>
 		<menu text="Preferences" style="padding: 5px;">
-			<menu-checkbox id="editorDrag" text="Drag Editor" />
-			<menu-item id="editorReset" text="Reset Editor Position" />
+			<menu-checkbox id="editorAutoSave" text="Autosave Chart" />
 			<menu-separator />
 			<vbox width="100%" style="padding: 5px;">
 				<label width="100%" styleName="menuHeader" text="Metronome Volume" verticalAlign="center" />
@@ -34,36 +35,30 @@
 		<vbox text="Assets">
 			<frame width="350" height="350">
 				<vbox>
-					<hbox>
+					<grid>
 						<label text="Player" horizontalAlign="center" />
-						<spacer width="75" />
-						<label text="GF" horizontalAlign="center" />
-						<spacer width="75" />
-						<label text="Opponent" verticalAlign="center" />
-					</hbox>
-					<hbox>
 						<dropdown id="playerSelect" width="75" horizontalAlign="center" />
-						<spacer />
+						<label text="GF" horizontalAlign="center" />
 						<dropdown id="gfSelect" width="75" horizontalAlign="center" />
-						<spacer />
+						<label text="Opponent" verticalAlign="center" />
 						<dropdown id="opponentSelect" width="75" horizontalAlign="center" />
-					</hbox>
+					</grid>
 					<menu-separator />
-					<hbox>
-						<label text="Stage" width="100" horizontalAlign="center" />
-						<label text="Style" width="100" horizontalAlign="center" />
-						<label text="Difficulty" width="100" horizontalAlign="center" />
-					</hbox>
-					<hbox>
+					<grid>
+						<label text="Stage" horizontalAlign="center" />
 						<dropdown id="stageSelect" width="90" horizontalAlign="center" />
+						<label text="Style" horizontalAlign="center" />
 						<dropdown id="styleSelect" width="90" horizontalAlign="center" />
-						<dropdown id="diffSelect" width="90" horizontalAlign="center" />
-					</hbox>
+					</grid>
 				</vbox>
 			</frame>
 		</vbox>
 		<vbox text="Section">
-
+			<frame width="350" height="350">
+				<vbox>
+					<checkbox id="sectionMustHit" text="Must Hit Section" horizontalAlign="center" />
+				</vbox>
+			</frame>
 		</vbox>
 		<vbox text="Song">
 			<frame>
@@ -78,6 +73,8 @@
 					<number-stepper id="dataBPM" pos="100" step="0.1" verticalAlign="center" />
 					<label text="Scroll Speed" verticalAlign="center" />
 					<number-stepper id="dataSpeed" pos="100" step="0.1" verticalAlign="center" />
+					<label text="Difficulty" horizontalAlign="center" />
+					<dropdown id="diffSelect" width="90" horizontalAlign="center" />
 				</grid>
 			</frame>
 		</vbox>
diff --git a/classpath.exclusions b/classpath.exclusions
new file mode 100644
index 00000000..78eec7ea
--- /dev/null
+++ b/classpath.exclusions
@@ -0,0 +1,13 @@
+; include paths that gets ignored by haxeui (it looks for module.xml files almost everywhere)
+; speeds up building time and completion
+; you can add your own paths too
+
+\/kec\/.*
+\/hxdiscord_rpc\/.*
+\/flixel\/.*
+\/flixel-text-input\/.*
+\/flixel-addons\.*
+\/openfl\/.*
+\/hxcpp-debug-server\/.*
+\/hxcpp\/.*
+\/lime\/.*
diff --git a/setup/easysetup.bat b/setup/easysetup.bat
index e9bfa088..2b0cca47 100644
--- a/setup/easysetup.bat
+++ b/setup/easysetup.bat
@@ -24,7 +24,6 @@ echo Press any key to install the git libraries.
 pause >nul
 title KEC Setup - Installing libraries
 haxelib git polymod https://github.com/swordcube/scriptless-polymod.git
-haxelib git tjson https://github.com/EliteMasterEric/TJSON.git
 haxelib git hscript-improved https://github.com/FNF-CNE-Devs/hscript-improved.git
 haxelib git haxeui-core https://github.com/haxeui/haxeui-core.git --skip-dependencies
 haxelib git haxeui-flixel https://github.com/haxeui/haxeui-flixel.git --skip-dependencies
diff --git a/setup/easysetup.sh b/setup/easysetup.sh
index ba48ea19..4a2e2ee9 100644
--- a/setup/easysetup.sh
+++ b/setup/easysetup.sh
@@ -12,7 +12,6 @@ haxelib run lime setup flixel
 haxelib run flixel-tools setup
 
 haxelib git polymod https://github.com/swordcube/scriptless-polymod.git
-haxelib git tjson https://github.com/EliteMasterEric/TJSON.git
 haxelib git hscript-improved https://github.com/FNF-CNE-Devs/hscript-improved.git
 haxelib git haxeui-core https://github.com/haxeui/haxeui-core.git --skip-dependencies
 haxelib git haxeui-flixel https://github.com/haxeui/haxeui-flixel.git --skip-dependencies
diff --git a/source/Init.hx b/source/Init.hx
index cbfe265f..cb23bbf0 100644
--- a/source/Init.hx
+++ b/source/Init.hx
@@ -1,5 +1,6 @@
 package;
 
+import kec.backend.util.FilterUtils;
 #if cpp
 import kec.backend.cpp.CPPInterface;
 #end
@@ -25,6 +26,9 @@ class Init extends MusicBeatState
 		kec.backend.KadeEngineData.initSave();
 
 		kec.backend.KeyBinds.keyCheck();
+		FilterUtils.initializeFilters();
+
+		FilterUtils.setColorBlindess(FlxG.save.data.colorblind);
 
 		// Gotta run this before any assets get loaded.
 		kec.backend.modding.ModCore.initialize();
diff --git a/source/kec/backend/Constants.hx b/source/kec/backend/Constants.hx
index 08ec6e83..da533e9e 100644
--- a/source/kec/backend/Constants.hx
+++ b/source/kec/backend/Constants.hx
@@ -53,6 +53,7 @@ class Constants
 	public static final noteColors:Array<String> = ['purple', 'blue', 'green', 'red'];
 	// Animation Names
 	public static final singAnimations:Array<String> = ['singLEFT', 'singDOWN', 'singUP', 'singRIGHT'];
+	public static final colorFilters:Array<String> = ['None', 'Deuteranopia', 'Protanopia', 'Tritanopia'];
 
 	public static final discordRpc:String = "898970552600002561";
 }
diff --git a/source/kec/backend/KadeEngineData.hx b/source/kec/backend/KadeEngineData.hx
index 0bda35ae..cf436510 100644
--- a/source/kec/backend/KadeEngineData.hx
+++ b/source/kec/backend/KadeEngineData.hx
@@ -259,6 +259,9 @@ class KadeEngineData
 		if (FlxG.save.data.enabledMods == null)
 			FlxG.save.data.enabledMods = [];
 
+		if (FlxG.save.data.colorblind == null)
+			FlxG.save.data.colorblind = 0; // none	
+
 		FlxSprite.defaultAntialiasing = FlxG.save.data.antialiasing;
 		FlxObject.defaultMoves = false;
 		PlayerSettings.player1.controls.loadKeyBinds();
diff --git a/source/kec/backend/Options.hx b/source/kec/backend/Options.hx
index 62f077ea..cffd8da7 100644
--- a/source/kec/backend/Options.hx
+++ b/source/kec/backend/Options.hx
@@ -1,5 +1,6 @@
 package kec.backend;
 
+import kec.backend.util.FilterUtils;
 import lime.app.Application;
 import lime.system.DisplayMode;
 import kec.backend.Controls.KeyboardScheme;
@@ -1987,7 +1988,7 @@ class IconBump extends Option
 
 	private override function updateDisplay():String
 	{
-		return "Icon Bumping: < " + (FlxG.save.data.motion ? "Enabled" : "Disabled") + " >";
+		return "Icon Bumping: < " + (FlxG.save.data.iconBop ? "Enabled" : "Disabled") + " >";
 	}
 }
 
@@ -2754,6 +2755,43 @@ class DeveloperMode extends Option
 	}
 }
 
+class ColorBlindOption extends Option
+{
+	public function new(desc:String)
+	{
+		super();
+		description = desc;
+	}
+
+	public override function left():Bool
+	{
+		FlxG.save.data.colorblind--;
+		if (FlxG.save.data.colorblind < 0)
+			FlxG.save.data.colorblind = Constants.colorFilters.length - 1;
+
+		FilterUtils.setColorBlindess(FlxG.save.data.colorblind);
+
+		display = updateDisplay();
+		return true;
+	}
+
+	public override function right():Bool
+	{
+		FlxG.save.data.colorblind++;
+		if (FlxG.save.data.colorblind > Constants.colorFilters.length - 1)
+			FlxG.save.data.colorblind = 0;
+
+		FilterUtils.setColorBlindess(FlxG.save.data.colorblind);
+		display = updateDisplay();	
+		return true;
+	}
+
+	private override function updateDisplay():String
+	{
+		return "Color Blindness: < " + (Constants.colorFilters[FlxG.save.data.colorblind]) + " >";
+	}
+}
+
 class ResetSettings extends Option
 {
 	var confirm:Bool = false;
@@ -2810,7 +2848,6 @@ class ResetSettings extends Option
 		FlxG.save.data.camzoom = null;
 		FlxG.save.data.scoreScreen = null;
 		FlxG.save.data.inputShow = null;
-		FlxG.save.data.optimize = null;
 		FlxG.save.data.laneTransparency = 0;
 		// custom shit
 		FlxG.save.data.hitsound = null;
@@ -2818,8 +2855,6 @@ class ResetSettings extends Option
 		FlxG.save.data.mem = null;
 		FlxG.save.data.unload = null;
 		FlxG.save.data.gen = null;
-		FlxG.save.data.oldcharter = null;
-		FlxG.save.data.motion = null;
 		FlxG.save.data.fpsMark = null;
 		FlxG.save.data.borderless = null;
 		FlxG.save.data.resolution = null;
@@ -2842,6 +2877,8 @@ class ResetSettings extends Option
 		FlxG.save.data.playHitsounds = null;
 		FlxG.save.data.playHitsoundsE = null;
 		FlxG.save.data.developer = null;
+		FlxG.save.data.iconBop = null;
+		FlxG.save.data.colorblind = null;
 
 		KadeEngineData.initSave();
 		confirm = false;
diff --git a/source/kec/backend/chart/Song.hx b/source/kec/backend/chart/Song.hx
index 18fc0372..1825423a 100644
--- a/source/kec/backend/chart/Song.hx
+++ b/source/kec/backend/chart/Song.hx
@@ -53,12 +53,18 @@ class Song
 	public static function loadFromJson(songId:String, difficulty:String):Modern
 	{
 		final songFile = 'data/songs/$songId/$songId$difficulty';
-
 		final rawJson = Paths.loadJSON(songFile);
 		final metaData:SongMeta = loadMetadata(songId);
+		doesChartExist(songId, difficulty);
 		return parseJSONshit(songId, rawJson, metaData);
 	}
 
+	public static function doesChartExist(songId:String, diff:String):Bool
+	{
+		final songFile = 'data/songs/$songId/$songId$diff.json';
+		return Paths.fileExists(songFile);
+	}
+
 	public static function loadMetadata(songId:String):SongMeta
 	{
 		var rawMetaJson = null;
diff --git a/source/kec/backend/util/FilterUtils.hx b/source/kec/backend/util/FilterUtils.hx
new file mode 100644
index 00000000..1bd1cf4f
--- /dev/null
+++ b/source/kec/backend/util/FilterUtils.hx
@@ -0,0 +1,60 @@
+package kec.backend.util;
+
+import openfl.filters.ColorMatrixFilter;
+import openfl.filters.BitmapFilter;
+import haxe.ds.StringMap;
+
+class FilterUtils
+{
+	// Mapping filter names to their corresponding matrices
+	public static var filterMap:StringMap<Array<Float>> = new StringMap();
+
+	public static function setColorBlindess(num:Int)
+	{
+		if (num == 0)
+		{
+			FlxG.game.setFilters([]);
+			return;
+		}
+
+		FlxG.game.setFilters([getFilterByName(Constants.colorFilters[num])]);
+	}
+
+	public static function initializeFilters()
+	{
+		// Populate the map with filter configurations
+		filterMap.set("Deuteranopia", [
+			 0.43, 0.72, -0.15, 0, 0,
+			 0.34, 0.57,  0.09, 0, 0,
+			-0.02, 0.03,     1, 0, 0,
+			    0,    0,     0, 1, 0,
+		]);
+
+		filterMap.set("Protanopia", [
+			0.20,  0.99, -0.19, 0, 0,
+			0.16,  0.79,  0.04, 0, 0,
+			0.01, -0.01,     1, 0, 0,
+			   0,     0,     0, 1, 0,
+		]);
+
+		filterMap.set("Tritanopia", [
+			0.97, 0.11, -0.08, 0, 0,
+			0.02, 0.82,  0.16, 0, 0,
+			0.06, 0.88,  0.18, 0, 0,
+			   0,    0,     0, 1, 0,
+		]);
+	}
+
+	// Function to get a BitmapFilter from a filter name
+	public static function getFilterByName(filterName:String):BitmapFilter
+	{
+		if (filterMap.exists(filterName))
+		{
+			// Retrieve the matrix and create a ColorMatrixFilter
+			var matrix = filterMap.get(filterName);
+			return new ColorMatrixFilter(matrix);
+		}
+		else
+			throw "No filter has been applied : " + filterName;
+	}
+}
diff --git a/source/kec/backend/util/Paths.hx b/source/kec/backend/util/Paths.hx
index f8dad35b..a8ad9678 100644
--- a/source/kec/backend/util/Paths.hx
+++ b/source/kec/backend/util/Paths.hx
@@ -31,7 +31,7 @@ class Paths
 		graphics = new Map<String, FlxGraphic>();
 		sounds = new Map<String, Sound>();
 		#if cpp
-			Gc.enable(true);
+		Gc.enable(true);
 		#end
 	}
 
@@ -296,7 +296,7 @@ class Paths
 			}
 		}
 
-		sound.close();
+		// sound.close();
 
 		OpenFlAssets.cache.removeSound(path);
 
diff --git a/source/kec/objects/editor/EditorNote.hx b/source/kec/objects/editor/EditorNote.hx
index f8debe0f..62ecd68a 100644
--- a/source/kec/objects/editor/EditorNote.hx
+++ b/source/kec/objects/editor/EditorNote.hx
@@ -31,7 +31,7 @@ class EditorNote extends FlxSprite
 	public var modAngle:Float = 0; // The angle set by modcharts
 	public var localAngle:Float = 0; // The angle to be edited inside Note.hx
 	public var originAngle:Float = 0; // The angle the OG note of the sus note had (?)
-	public var noteCharterObject:FlxSprite;
+	public var sustain:EditorSustain;
 
 	private function set_texture(v:String)
 	{
@@ -96,9 +96,7 @@ class EditorNote extends FlxSprite
 	}
 
 	function get_isPlayer():Bool
-	{
 		return rawData > 3;
-	}
 
 	public function new()
 	{
@@ -117,11 +115,10 @@ class EditorNote extends FlxSprite
 		this.type = type;
 		this.beat = b;
 		selected = false;
-		noteCharterObject = null;
+		sustain = null;
 		angle = modAngle = localAngle = 0;
 
 		visible = true;
-		active = false;
 
 		var animToPlay:String = '';
 		animToPlay = Constants.noteColors[data] + 'Scroll';
@@ -204,6 +201,7 @@ class EditorNote extends FlxSprite
 
 	override function kill()
 	{
+		visible = false;
 		super.kill();
 	}
 }
diff --git a/source/kec/objects/editor/EditorSustain.hx b/source/kec/objects/editor/EditorSustain.hx
index 062d558b..b906acd4 100644
--- a/source/kec/objects/editor/EditorSustain.hx
+++ b/source/kec/objects/editor/EditorSustain.hx
@@ -14,5 +14,12 @@ class EditorSustain extends FlxSprite
 		setGraphicSize(sizeX, sizeY);
 		updateHitbox();
 		setPosition(x, y);
+		visible = true;
+	}
+
+	override function kill()
+	{
+		visible = false;
+		super.kill();
 	}
 }
diff --git a/source/kec/objects/note/Note.hx b/source/kec/objects/note/Note.hx
index 4e2dbd36..37d26c1a 100644
--- a/source/kec/objects/note/Note.hx
+++ b/source/kec/objects/note/Note.hx
@@ -54,7 +54,7 @@ class Note extends FlxSprite
 
 	public var beat:Float = 0;
 
-	public static var swagWidth:Float = 160 * 0.7;
+	public static final swagWidth:Float = 160 * 0.7;
 	public static final PURP_NOTE:Int = 0;
 	public static final GREEN_NOTE:Int = 2;
 	public static final BLUE_NOTE:Int = 1;
@@ -82,7 +82,15 @@ class Note extends FlxSprite
 	public var speedMultiplier:Float = 1.0;
 	public var overrideDistance:Bool = false; // Set this to true if you know what are you doing.
 
-	public var modAlpha:Float = 1;
+	/**
+	 * Alpha helper to modify note alpha in-game (modcharts), use this instead of note.alpha
+	 */
+	public var modAlpha(default, set):Float = 1.0;
+
+	/**
+	 * Alpha helper for master note alpha, use this instead of note.alpha
+	 */
+	public var localAlpha(default, set):Float = 1.0;
 
 	public static var defaultPlayerSkin(default, never):String = 'noteskins/Arrows';
 	public static var defaultCpuSkin(default, never):String = 'noteskins/Arrows';
@@ -288,6 +296,8 @@ class Note extends FlxSprite
 			if (inCharter)
 				x += 30;
 
+			isSustainEnd = true;
+
 			if (prevNote.isSustainNote)
 			{
 				prevNote.animation.play(Constants.noteColors[prevNote.originColor] + 'hold');
@@ -298,7 +308,10 @@ class Note extends FlxSprite
 					prevNote.scale.y *= 1.0 + (1.0 / prevNote.frameHeight) * 1.05;
 
 				prevNote.updateHitbox();
+				prevNote.isSustainEnd = false;
 			}
+
+			localAlpha = FlxG.save.data.alpha;
 		}
 		else if (!isSustainNote)
 		{
@@ -329,9 +342,7 @@ class Note extends FlxSprite
 
 		var animName:String = null;
 		if (animation.curAnim != null)
-		{
 			animName = animation.curAnim.name;
-		}
 
 		var lastScaleY:Float = scale.y;
 		var skinPostfix:String = '';
@@ -377,9 +388,7 @@ class Note extends FlxSprite
 		if (noteTypeCheck != 'pixel')
 		{
 			if (isSustainNote && (animation.curAnim != null && !animation.curAnim.name.endsWith('end')))
-			{
 				scale.y = lastScaleY;
-			}
 		}
 
 		updateHitbox();
@@ -435,16 +444,14 @@ class Note extends FlxSprite
 		{
 			if (isSustainNote)
 			{
-				var newStepHeight = (((0.45 * PlayState.instance.fakeNoteStepCrochet)) * FlxMath.roundDecimal(PlayState.instance.scrollSpeed == 1 ? PlayState.SONG.speed : PlayState.instance.scrollSpeed,
+				final newStepHeight = (((0.45 * PlayState.instance.fakeNoteStepCrochet)) * FlxMath.roundDecimal(PlayState.instance.scrollSpeed == 1 ? PlayState.SONG.speed : PlayState.instance.scrollSpeed,
 					2) * speedMultiplier);
 
 				if (stepHeight != newStepHeight)
 				{
 					stepHeight = newStepHeight;
 					if (isSustainNote)
-					{
 						noteYOff = -stepHeight + swagWidth * 0.5;
-					}
 				}
 
 				flipY = PlayStateChangeables.useDownscroll;
@@ -457,13 +464,9 @@ class Note extends FlxSprite
 					case 'hurt':
 						if (strumTime - Conductor.elapsedPosition <= ((Ratings.timingWindows[0].timingWindow) * 0.2)
 							&& strumTime - Conductor.elapsedPosition >= (-Ratings.timingWindows[0].timingWindow) * 0.4)
-						{
 							canBeHit = true;
-						}
 						else
-						{
 							canBeHit = false;
-						}
 						if (strumTime - Conductor.elapsedPosition < -Ratings.timingWindows[0].timingWindow && !wasGoodHit)
 							tooLate = true;
 					default:
@@ -477,13 +480,7 @@ class Note extends FlxSprite
 				}
 			}
 
-			if (isSustainNote)
-			{
-				isSustainEnd = spotInLine == parent.children.length - 1;
-				alpha = !sustainActive
-					&& (parent.tooLate || parent.wasGoodHit) ? (modAlpha * FlxG.save.data.alpha) * 0.5 : modAlpha * FlxG.save.data.alpha; // This is the correct way
-			}
-			else if (tooLate && !wasGoodHit)
+			if (tooLate && !wasGoodHit)
 			{
 				if (alpha > modAlpha * 0.3)
 					alpha = modAlpha * 0.3;
@@ -497,8 +494,6 @@ class Note extends FlxSprite
 			noteCharterObject.destroy();
 
 		super.destroy();
-
-		_lastValidChecked = '';
 	}
 
 	@:noCompletion
@@ -520,4 +515,77 @@ class Note extends FlxSprite
 
 		return rect;
 	}
+
+	public function followStaticArrow(parent:StaticArrow)
+	{
+		final leSpeed:Float = PlayState.instance.scrollSpeed == 1 ? PlayState.SONG.speed : PlayState.instance.scrollSpeed;
+		if (isSustainNote)
+			x = (parent.x + (parent._cos * distance)) + (swagWidth / 3);
+		else
+			x = parent.x + (parent._cos * distance);
+
+		if (isSustainNote && noteTypeCheck == 'pixel')
+			x -= 5;
+
+		if (!overrideDistance)
+		{
+			if (parent.downScroll)
+				distance = (0.45 * (Conductor.elapsedPosition - strumTime)) * (FlxMath.roundDecimal(leSpeed, 2)) - noteYOff;
+			else
+				distance = (-0.45 * (Conductor.elapsedPosition - strumTime)) * (FlxMath.roundDecimal(leSpeed, 2)) + noteYOff;
+		}
+
+		y = parent.y + (parent._sin * distance);
+
+		// modchart shit
+
+		visible = parent.visible;
+		if (!isSustainNote)
+			modAngle = parent.modAngle;
+
+		modAlpha = parent.modAlpha;
+	}
+
+	public function clipToStaticArrow(parent:StaticArrow)
+	{
+		if (!isSustainNote || !sustainActive || !causesMisses)
+			return;
+
+		final center:Float = parent.y + swagWidth * 0.5;
+		final swagRect:FlxRect = FlxRect.get(0, 0, frameWidth, frameHeight);
+
+		switch (parent.downScroll)
+		{
+			case true:
+				if (y - offset.y * scale.y + height >= center)
+				{
+					swagRect.width = frameWidth;
+					swagRect.height = (center - y) / scale.y;
+					swagRect.y = frameHeight - swagRect.height;
+				}
+			case false:
+				if (y + offset.y * scale.y <= center)
+				{
+					swagRect.y = (center - y) / scale.y;
+					swagRect.width = width / scale.x;
+					swagRect.height = (height / scale.y) - swagRect.y;
+				}
+		}
+		clipRect = swagRect;
+		swagRect.put();
+	}
+
+	function set_localAlpha(a:Float)
+	{
+		localAlpha = a;
+		alpha = localAlpha * modAlpha;
+		return a;
+	}
+
+	function set_modAlpha(a:Float)
+	{
+		modAlpha = a;
+		alpha = localAlpha * modAlpha;
+		return a;
+	}
 }
diff --git a/source/kec/objects/note/StaticArrow.hx b/source/kec/objects/note/StaticArrow.hx
index 119d913a..bf02b6cc 100644
--- a/source/kec/objects/note/StaticArrow.hx
+++ b/source/kec/objects/note/StaticArrow.hx
@@ -24,7 +24,7 @@ class StaticArrow extends FlxSprite
 	private var dataSuffix:Array<String> = ['LEFT', 'DOWN', 'UP', 'RIGHT'];
 	private var dataColor:Array<String> = ['purple', 'blue', 'green', 'red'];
 	private var player:Int;
-	private var noteData:Int = 0;
+	private var lane:Int = 0;
 
 	public var resetAnim:Float = 0;
 
@@ -54,7 +54,7 @@ class StaticArrow extends FlxSprite
 		x = xx;
 		y = yy;
 		this.player = player;
-		noteData = data;
+		lane = data;
 		super(x, y);
 		direction = 90;
 
@@ -103,14 +103,12 @@ class StaticArrow extends FlxSprite
 				updateHitbox();
 				antialiasing = false;
 
-				animation.add('static', [noteData]);
-				animation.add('pressed', [4 + noteData, 8 + noteData], 12, false);
-				animation.add('confirm', [12 + noteData, 16 + noteData], 12, false);
+				animation.add('static', [lane]);
+				animation.add('pressed', [4 + lane, 8 + lane], 12, false);
+				animation.add('confirm', [12 + lane, 16 + lane], 12, false);
 
 				for (j in 0...4)
-				{
 					animation.add('dirCon' + j, [12 + j, 16 + j], 12, false);
-				}
 			default:
 				frames = Paths.getSparrowAtlas(texture);
 				for (j in 0...4)
@@ -119,9 +117,9 @@ class StaticArrow extends FlxSprite
 					animation.addByPrefix('dirCon' + j, dataSuffix[j].toLowerCase() + ' confirm', 24, false);
 				}
 
-				var lowerDir:String = dataSuffix[noteData].toLowerCase();
+				var lowerDir:String = dataSuffix[lane].toLowerCase();
 
-				animation.addByPrefix('static', 'arrow' + dataSuffix[noteData]);
+				animation.addByPrefix('static', 'arrow' + dataSuffix[lane]);
 				animation.addByPrefix('pressed', lowerDir + ' press', 24, false);
 				animation.addByPrefix('confirm', lowerDir + ' confirm', 24, false);
 
diff --git a/source/kec/objects/ui/HealthIcon.hx b/source/kec/objects/ui/HealthIcon.hx
index 757d3340..e7d1b34a 100644
--- a/source/kec/objects/ui/HealthIcon.hx
+++ b/source/kec/objects/ui/HealthIcon.hx
@@ -38,6 +38,7 @@ class HealthIcon extends FlxSprite
 		animOffsets = new Map<String, Array<Dynamic>>();
 
 		changeIcon(char);
+		allowedToBop = FlxG.save.data.iconBop;
 		scrollFactor.set();
 	}
 
@@ -55,81 +56,81 @@ class HealthIcon extends FlxSprite
 
 	public function changeIcon(newChar:String):Void
 	{
-		if (newChar != char)
+		if (newChar == char)
+			return;
+
+		char = newChar;
+		var name:String = 'icon-' + newChar;
+		switch (Paths.fileExists('images/icons/animated/' + name + '.png'))
 		{
-			char = newChar;
-			var name:String = 'icon-' + newChar;
-			switch (Paths.fileExists('images/icons/animated/' + name + '.png'))
-			{
-				case true:
-					frames = Paths.getSparrowAtlas('icons/animated/$name');
-					for (i in 0...frames.frames.length)
-						animation.addByPrefix(animationNames[i], animationNames[i], 24, false, isPlayer);
-
-				case false:
-					if (!Paths.fileExists('images/icons/$name.png'))
-						name = 'icon-face';
-					final graphic = Paths.image('icons/$name');
-					final iSize:Float = Math.round(graphic.width / graphic.height);
-					loadGraphic(graphic, true, Math.floor(graphic.width / iSize), Math.floor(graphic.height));
-					updateHitbox();
-					for (i in 0...frames.frames.length)
-						animation.add(animationNames[i], [i], 0, false, isPlayer);
-			}
-			animation.play('Idle');
-
-			if (char.endsWith('-pixel') || char.startsWith('senpai') || char.startsWith('spirit'))
-				antialiasing = false
-			else
-				antialiasing = FlxG.save.data.antialiasing;
-
-			scrollFactor.set();
+			case true:
+				frames = Paths.getSparrowAtlas('icons/animated/$name');
+				for (i in animationNames)
+					animation.addByPrefix(i, i, 24, false, isPlayer);
+
+			case false:
+				if (!Paths.fileExists('images/icons/$name.png'))
+					name = 'icon-face';
+				final graphic = Paths.image('icons/$name');
+				final iSize:Float = Math.round(graphic.width / graphic.height);
+				loadGraphic(graphic, true, Math.floor(graphic.width / iSize), Math.floor(graphic.height));
+				updateHitbox();
+				for (i in 0...frames.frames.length)
+					animation.add(animationNames[i], [i], 0, false, isPlayer);
 		}
+		animation.play('Idle');
+
+		if (char.endsWith('-pixel') || char.startsWith('senpai') || char.startsWith('spirit'))
+			antialiasing = false
+		else
+			antialiasing = FlxG.save.data.antialiasing;
+
+		scrollFactor.set();
 		playAnimation('Idle');
 		initTargetSize();
 	}
 
 	public function onStepHit(step:Int)
 	{
-		if ((FlxG.save.data.iconBop && allowedToBop) && step % stepsBetween == 0)
-		{
-			// Make the icon increase in size (the update function causes them to lerp back down).
-			if (this.width > this.height)
-				setGraphicSize(Std.int(this.width + (defaultSize * this.size.x * sizeMult)), 0);
-			else
-				setGraphicSize(0, Std.int(this.height + (defaultSize * this.size.y * sizeMult)));
-			this.updateHitbox();
-		}
+		if (!allowedToBop)
+			return;
+
+		if (step % stepsBetween != 0)
+			return;
+		// Make the icon increase in size (the update function causes them to lerp back down).
+		if (this.width > this.height)
+			setGraphicSize(Std.int(this.width + (defaultSize * this.size.x * sizeMult)), 0);
+		else
+			setGraphicSize(0, Std.int(this.height + (defaultSize * this.size.y * sizeMult)));
+		this.updateHitbox();
 	}
 
 	override function update(elapsed:Float)
 	{
 		super.update(elapsed);
 
-		if (FlxG.save.data.iconBop && allowedToBop)
-		{
-			if (this.width > this.height)
-			{
-				// Apply linear interpolation while accounting for frame rate.
-				var targetSize:Int = Std.int(CoolUtil.coolLerp(this.width, defaultSize * this.size.x, 0.15));
-				setGraphicSize(targetSize, 0);
-			}
-			else
-			{
-				var targetSize:Int = Std.int(CoolUtil.coolLerp(this.height, defaultSize * this.size.y, 0.15));
-				setGraphicSize(0, targetSize);
-			}
-			this.updateHitbox();
-		}
-
 		if (sprTracker != null)
 			setPosition(sprTracker.x + sprTracker.width + 10, sprTracker.y - 30);
+
+		if (!allowedToBop)
+			return;
+
+		if (this.width > this.height)
+		{
+			// Apply linear interpolation while accounting for frame rate.
+			var targetSize:Int = Std.int(CoolUtil.coolLerp(this.width, defaultSize * this.size.x, 0.15));
+			setGraphicSize(targetSize, 0);
+		}
+		else
+		{
+			var targetSize:Int = Std.int(CoolUtil.coolLerp(this.height, defaultSize * this.size.y, 0.15));
+			setGraphicSize(0, targetSize);
+		}
+		this.updateHitbox();
 	}
 
 	public function addOffset(name:String, x:Float = 0, y:Float = 0)
-	{
 		animOffsets[name] = [x, y];
-	}
 
 	inline function initTargetSize():Void
 	{
@@ -201,16 +202,15 @@ class HealthIcon extends FlxSprite
 
 	public function playAnimation(newAnim:String)
 	{
-		if (hasAnimation(newAnim) && finishedAnim())
-		{
-			this.animation.play(newAnim, true, false);
-			var daOffset = animOffsets.get(newAnim);
-
-			if (animOffsets.exists(newAnim))
-				offset.set(daOffset[0], daOffset[1]);
-			else
-				offset.set(0, 0);
+		if (!hasAnimation(newAnim) && !finishedAnim())
 			return;
-		}
+		this.animation.play(newAnim, false, false);
+		var daOffset = animOffsets.get(newAnim);
+
+		if (animOffsets.exists(newAnim))
+			offset.set(daOffset[0], daOffset[1]);
+		else
+			offset.set(0, 0);
+		return;
 	}
 }
diff --git a/source/kec/states/FreeplayState.hx b/source/kec/states/FreeplayState.hx
index b1f56e04..68da9de4 100644
--- a/source/kec/states/FreeplayState.hx
+++ b/source/kec/states/FreeplayState.hx
@@ -861,10 +861,7 @@ class FreeplayState extends MusicBeatState
 		FlxG.sound.music.stop();
 
 		if (isCharting)
-		{
-			ChartingState.clean = true;
 			MusicBeatState.switchState(new ChartingState());
-		}
 		else
 			MusicBeatState.switchState(new PlayState());
 	}
diff --git a/source/kec/states/MusicBeatState.hx b/source/kec/states/MusicBeatState.hx
index 1f96f062..ae9137d5 100644
--- a/source/kec/states/MusicBeatState.hx
+++ b/source/kec/states/MusicBeatState.hx
@@ -52,13 +52,13 @@ class MusicBeatState extends FlxTransitionableState
 		// Setup The Tween / Timer Manager.
 		tweenManager = new FlxTweenManager();
 		timerManager = new FlxTimerManager();
+		fullscreenBind = FlxKey.fromString(Std.string(FlxG.save.data.fullscreenBind));
 	}
 
 	override function create()
 	{
 		transSubstate = new CustomFadeTransition(0.4);
 		destroySubStates = false;
-		fullscreenBind = FlxKey.fromString(Std.string(FlxG.save.data.fullscreenBind));
 
 		var skip:Bool = FlxTransitionableState.skipNextTransOut;
 		if (!skip)
diff --git a/source/kec/states/PlayState.hx b/source/kec/states/PlayState.hx
index 8d24911e..0e6d07b9 100644
--- a/source/kec/states/PlayState.hx
+++ b/source/kec/states/PlayState.hx
@@ -1,5 +1,6 @@
 package kec.states;
 
+import haxe.ds.StringMap;
 import flixel.addons.effects.FlxTrail;
 import flixel.addons.transition.FlxTransitionableState;
 import flixel.graphics.FlxGraphic;
@@ -130,20 +131,16 @@ class PlayState extends MusicBeatState
 	public var scripts:ScriptGroup;
 	#end
 
-	// HScript And Lua Stuff. If There's A File, It'll Be True.
+	// Lua Stuff. If There's A File, It'll Be True.
 	public var executeModchart = false;
 
 	// Character Animation Related
-	var currentFrames:Int = 0;
 	var idleToBeat:Bool = true; // change if bf and dad would idle to the beat of the song
 	var idleBeat:Int = 2; // how frequently bf and dad would play their idle animation(1 - every beat, 2 - every 2 beats and so on)
 	var forcedToIdle:Bool = false; // change if bf and dad are forced to idle to every (idleBeat) beats of the song
 	var allowedToHeadbang:Bool = true; // Will decide if gf is allowed to headbang depending on the song
 	var allowedToCheer:Bool = false; // Will decide if gf is allowed to cheer depending on the song
 
-	// Tracks The Last Score (I Don't Know What It Does.)
-	public static var lastScore:Array<FlxSprite> = [];
-
 	// BotPlay text
 	public var addedBotplay:Bool = false;
 
@@ -160,12 +157,6 @@ class PlayState extends MusicBeatState
 	// If The Arrows Are Generated / Shown.
 	public var arrowsGenerated:Bool = false;
 
-	// New Input / Ghost Tapping. Idk It's Pretty Outdated.
-	public static var theFunne:Bool = true;
-
-	// Replay Stuff
-	public static var inResults:Bool = false;
-
 	// If Is In PlayState.
 	public static var inDaPlay:Bool = false;
 
@@ -213,9 +204,9 @@ class PlayState extends MusicBeatState
 	public var gf:Character = null;
 	public var boyfriend:Character = null;
 
-	public var boyfriendMap:Map<String, Character> = new Map<String, Character>();
-	public var dadMap:Map<String, Character> = new Map<String, Character>();
-	public var gfMap:Map<String, Character> = new Map<String, Character>();
+	public var boyfriendMap:StringMap<Character>;
+	public var dadMap:StringMap<Character>;
+	public var gfMap:StringMap<Character>;
 
 	public var boyfriendGroup:FlxTypedGroup<Character>;
 	public var dadGroup:FlxTypedGroup<Character>;
@@ -345,25 +336,16 @@ class PlayState extends MusicBeatState
 
 	// Adding Objects Using Lua
 	public function addObject(object:FlxBasic)
-	{
 		add(object);
-	}
 
 	// Removing Objects Using Lua
 	public function removeObject(object:FlxBasic)
-	{
 		remove(object);
-	}
 
 	override public function create()
 	{
 		var stamp:Float = haxe.Timer.stamp();
 		Paths.clearCache();
-		// Initialize The Scripts.
-		#if FEATURE_HSCRIPT
-		scripts = new ScriptGroup();
-		scripts.onAddScript.push(onAddScript);
-		#end
 
 		FlxG.mouse.visible = FlxG.mouse.enabled = false;
 
@@ -387,7 +369,6 @@ class PlayState extends MusicBeatState
 		Stats.resetStats();
 
 		highestCombo = 0;
-		inResults = false;
 
 		initGameplaySettings();
 
@@ -406,9 +387,7 @@ class PlayState extends MusicBeatState
 		// Use FileSystem on desktop for cool modcharts with no compile :>
 
 		if (FlxG.save.data.gen)
-		{
 			Debug.logInfo('Searching for Lua Modchart? ($executeModchart) at ${Paths.lua('songs/${PlayState.SONG.songId}/modchart')}');
-		}
 
 		if (executeModchart)
 			Conductor.rate = 1;
@@ -443,9 +422,7 @@ class PlayState extends MusicBeatState
 
 		introGroup = new FlxTypedGroup<IntroSprite>();
 		for (i in 0...3)
-		{
 			introGroup.add(new IntroSprite());
-		}
 
 		numGroup = new FlxTypedGroup<ComboNumber>();
 		for (i in 0...9)
@@ -487,31 +464,21 @@ class PlayState extends MusicBeatState
 					stageCheck = 'limo';
 				case 5:
 					if (SONG.songId == 'winter-horrorland')
-					{
 						stageCheck = 'mallEvil';
-					}
 					else
-					{
 						stageCheck = 'mall';
-					}
 				case 6:
 					if (SONG.songId == 'thorns')
-					{
 						stageCheck = 'schoolEvil';
-					}
 					else
-					{
 						stageCheck = 'school';
-					}
 				case 7:
 					stageCheck = 'tank';
 					// i should check if its stage (but this is when none is found in chart anyway)
 			}
 		}
 		else
-		{
 			stageCheck = SONG.stage;
-		}
 
 		Stage = new Stage(stageCheck);
 		Stage.initStageProperties();
@@ -538,7 +505,7 @@ class PlayState extends MusicBeatState
 		// Initialize Scripts For Real.
 
 		var positions = Stage.positions[Stage.curStage];
-		var charGroup:FlxTypedGroup<Character> = new FlxTypedGroup<Character>();
+		var charGroup:Array<Character> = [];
 
 		if (gf != null)
 			gfGroup.add(gf);
@@ -550,27 +517,27 @@ class PlayState extends MusicBeatState
 		{
 			g.x += g.data.charPos[0];
 			g.y += g.data.charPos[1];
-			charGroup.add(g);
+			charGroup.push(g);
 		}
 
 		for (d in dadGroup.members)
 		{
 			d.x += d.data.charPos[0];
 			d.y += d.data.charPos[1];
-			charGroup.add(d);
+			charGroup.push(d);
 		}
 
 		for (b in boyfriendGroup.members)
 		{
 			b.x += b.data.charPos[0];
 			b.y += b.data.charPos[1];
-			charGroup.add(b);
+			charGroup.push(b);
 		}
 
 		if (positions != null)
 		{
 			for (char => pos in positions)
-				for (person in charGroup.members)
+				for (person in charGroup)
 					if (person.data.char == char)
 						person.setPosition(pos[0], pos[1]);
 		}
@@ -578,9 +545,7 @@ class PlayState extends MusicBeatState
 		if (FlxG.save.data.background)
 		{
 			for (i in Stage.toAdd)
-			{
 				add(i);
-			}
 
 			for (index => array in Stage.layInFront)
 			{
@@ -777,13 +742,9 @@ class PlayState extends MusicBeatState
 
 		// String that contains the mode defined here so it isn't necessary to call changePresence for each mode
 		if (isStoryMode)
-		{
 			detailsText = "Story Mode: Week " + storyWeek;
-		}
 		else
-		{
 			detailsText = "Freeplay";
-		}
 
 		// String for when the game is paused
 		detailsPausedText = "Paused - " + detailsText;
@@ -851,9 +812,7 @@ class PlayState extends MusicBeatState
 		judgementCounter.screenCenter(Y);
 		judgementCounter.text = 'Marvelous: ${Stats.marvs}\nSicks: ${Stats.sicks}\nGoods: ${Stats.goods}\nBads: ${Stats.bads}\nShits: ${Stats.shits}\nMisses: ${Stats.misses}';
 		if (FlxG.save.data.judgementCounter)
-		{
 			uiGroup.add(judgementCounter);
-		}
 
 		botPlayState = new FlxText(565, correctY + (PlayStateChangeables.useDownscroll ? 25 : -175), 0, "BOTPLAY", 20);
 		botPlayState.setFormat(Paths.font("vcr.ttf"), 42, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
@@ -976,9 +935,7 @@ class PlayState extends MusicBeatState
 			});
 
 		for (i in 1...3)
-		{
 			precacheThing('styles/$styleName/missnote$i', 'sound');
-		}
 
 		startingSong = true;
 
@@ -1332,9 +1289,6 @@ class PlayState extends MusicBeatState
 
 		keys[data] = false;
 		keyReleased(data);
-
-		if (songStarted && !paused)
-			keyShit();
 	}
 
 	private function keyReleased(key:Int)
@@ -1342,6 +1296,11 @@ class PlayState extends MusicBeatState
 		if (PlayStateChangeables.botPlay || !startedCountdown || paused || key < 0 || key >= playerStrums.length)
 			return;
 
+		#if FEATURE_LUAMODCHART
+		if (luaModchart != null)
+			luaModchart.executeState('onKeyReleased', [key]);
+		#end
+
 		final spr:StaticArrow = playerStrums.members[key];
 		if (spr != null)
 		{
@@ -1428,9 +1387,7 @@ class PlayState extends MusicBeatState
 
 		if (closestNotes.length != 0)
 		{
-			var coolNote = null;
-			coolNote = defNotes[0];
-
+			final coolNote = defNotes[0];
 			if (defNotes.length > 1) // stacked notes or really close ones
 			{
 				for (i in 0...defNotes.length)
@@ -1450,8 +1407,10 @@ class PlayState extends MusicBeatState
 		else if (!FlxG.save.data.ghost && songStarted)
 			noteMissPress(key);
 
-		if (songStarted && !inCutscene && !paused)
-			keyShit();
+		#if FEATURE_LUAMODCHART
+		if (luaModchart != null)
+			luaModchart.executeState('onKeyPressed', [key]);
+		#end
 
 		final spr:StaticArrow = playerStrums.members[key];
 		if (spr != null
@@ -1793,10 +1752,6 @@ class PlayState extends MusicBeatState
 
 		final chartNotes:Array<Section> = songData.notes;
 
-		var playerCounter:Int = 0;
-
-		var daBeats:Int = 0;
-
 		for (section in chartNotes)
 		{
 			for (i in 0...section.sectionNotes.length)
@@ -2023,9 +1978,6 @@ class PlayState extends MusicBeatState
 		{
 			if (!startTimer.finished)
 				startTimer.active = true;
-
-			if (!PlayStateChangeables.botPlay)
-				keyShit();
 			paused = false;
 
 			#if FEATURE_DISCORD
@@ -2091,6 +2043,8 @@ class PlayState extends MusicBeatState
 
 				unspawnNotes.shift();
 				currentLuaIndex++;
+
+				notes.sort(FlxSort.byY, (PlayStateChangeables.useDownscroll ? FlxSort.ASCENDING : FlxSort.DESCENDING));
 			}
 		}
 
@@ -2221,7 +2175,6 @@ class PlayState extends MusicBeatState
 			executeModchart = false;
 			cannotDie = true;
 			persistentUpdate = false;
-			ChartingState.clean = true;
 			MusicBeatState.switchState(new ChartingState());
 		}
 
@@ -2420,9 +2373,6 @@ class PlayState extends MusicBeatState
 
 		if (generatedMusic && !(inCutscene || inCinematic))
 		{
-			var holdArray:Array<Bool> = [controls.LEFT, controls.DOWN, controls.UP, controls.RIGHT];
-			var leSpeed = scrollSpeed == 1 ? SONG.speed : scrollSpeed;
-
 			// hell
 			// note scroll code (mostly)
 
@@ -2440,9 +2390,7 @@ class PlayState extends MusicBeatState
 					return;
 				}
 
-				var strum:FlxTypedGroup<StaticArrow> = playerStrums;
-				if (!daNote.mustPress)
-					strum = cpuStrums;
+				final strum:StaticArrow = strumLineNotes.members[daNote.rawNoteData];
 
 				#if FEATURE_HSCRIPT
 				if (!ScriptUtil.hasPause(scripts.executeAllFunc("notesUpdate", [daNote])))
@@ -2451,74 +2399,8 @@ class PlayState extends MusicBeatState
 				};
 				#end
 
-				var strumY = strum.members[daNote.noteData].y;
-				var strumX = strum.members[daNote.noteData].x;
-
-				var strumScrollType = strum.members[daNote.noteData].downScroll;
-
-				var strumDirection = strum.members[daNote.noteData].direction;
-
-				var origin = strumY + Note.swagWidth * 0.5;
-
-				if (daNote.isSustainNote)
-					daNote.x = (strumX + (strum.members[daNote.noteData]._cos * daNote.distance)) + (Note.swagWidth / 3);
-				else
-					daNote.x = strumX + (strum.members[daNote.noteData]._cos * daNote.distance);
-
-				if (styleName == 'pixel' && daNote.isSustainNote)
-					daNote.x -= 5;
-
-				if (!daNote.overrideDistance)
-				{
-					if (PlayStateChangeables.useDownscroll)
-						daNote.distance = (0.45 * (Conductor.elapsedPosition - daNote.strumTime)) * (FlxMath.roundDecimal(leSpeed, 2)) - daNote.noteYOff;
-					else
-						daNote.distance = (-0.45 * (Conductor.elapsedPosition - daNote.strumTime)) * (FlxMath.roundDecimal(leSpeed, 2)) + daNote.noteYOff;
-				}
-				daNote.y = strumY + (strum.members[daNote.noteData]._sin * daNote.distance);
-				if (daNote.isSustainNote)
-				{
-					if (daNote.sustainActive && daNote.causesMisses)
-					{
-						if (strumScrollType)
-						{
-							if (daNote.y - daNote.offset.y * daNote.scale.y + daNote.height >= strumY + Note.swagWidth / 2)
-							{
-								// Clip to strumline
-								final swagRect:FlxRect = FlxRect.get(0, 0, daNote.width / daNote.scale.x, daNote.height / daNote.scale.y);
-								swagRect.height = ((strumY + Note.swagWidth / 2) - daNote.y) / daNote.scale.y;
-								swagRect.y = daNote.frameHeight - swagRect.height;
-								daNote.clipRect = swagRect;
-								swagRect.put();
-							}
-						}
-						else
-						{
-							if (daNote.y + daNote.offset.y * daNote.scale.y <= strumY + Note.swagWidth / 2)
-							{
-								final swagRect:FlxRect = FlxRect.get(0, 0, daNote.width / daNote.scale.x, daNote.height / daNote.scale.y);
-								swagRect.y = ((strumY + Note.swagWidth / 2) - daNote.y) / daNote.scale.y;
-								swagRect.height -= swagRect.y;
-								daNote.clipRect = swagRect;
-								swagRect.put();
-							}
-						}
-					}
-				}
-
-				if (!daNote.modifiedByLua)
-				{
-					daNote.visible = strum.members[Math.floor(Math.abs(daNote.noteData))].visible;
-					if (!daNote.isSustainNote)
-					{
-						daNote.alpha = strum.members[Math.floor(Math.abs(daNote.noteData))].alpha;
-						daNote.modAngle = strum.members[Math.floor(Math.abs(daNote.noteData))].modAngle;
-					}
-					if (daNote.isSustainNote && daNote.sustainActive)
-					{
-						daNote.modAlpha = strum.members[Math.floor(Math.abs(daNote.noteData))].alpha;
-					}
-				}
+				daNote.followStaticArrow(strum);
+				daNote.clipToStaticArrow(strum);
 
 				if (!daNote.mustPress)
 				{
@@ -2534,8 +2416,6 @@ class PlayState extends MusicBeatState
 						handleHolds(daNote);
 				}
 
-				// there was some code idk what it did but it fucked with color quantization shit. ik its a feature not many like but I like it.
-
 				if (!daNote.mustPress && PlayStateChangeables.middleScroll && !executeModchart)
 					daNote.visible = false;
 
@@ -2563,6 +2443,7 @@ class PlayState extends MusicBeatState
 											for (i in daNote.children)
 											{
 												i.sustainActive = false;
+												i.clipRect = null;
 											}
 											health -= (daNote.missHealth * PlayStateChangeables.healthLoss);
 											noteMiss(daNote.noteData, daNote);
@@ -2587,7 +2468,7 @@ class PlayState extends MusicBeatState
 							if (daNote.mustPress)
 							{
 								if (!daNote.wasGoodHit && daNote.isSustainNote && daNote.sustainActive && !daNote.isSustainEnd && daNote.causesMisses
-									&& !holdArray[daNote.noteData])
+									&& !keys[daNote.noteData])
 								{
 									// there should be a ! infront of the wasGoodHit one but it'd cause a miss per every sustain note.
 									// now it just misses on the slightest sustain end for some reason.
@@ -2596,7 +2477,9 @@ class PlayState extends MusicBeatState
 									for (i in daNote.parent.children)
 									{
 										i.sustainActive = false;
+										i.clipRect = null;
 									}
+
 									health -= (daNote.missHealth * PlayStateChangeables.healthLoss);
 									noteMiss(daNote.noteData, daNote);
 								}
@@ -2771,7 +2654,6 @@ class PlayState extends MusicBeatState
 					if (FlxG.save.data.scoreScreen)
 					{
 						persistentUpdate = false;
-						inResults = true;
 						openSubState(subStates[1]);
 					}
 					else
@@ -2810,7 +2692,6 @@ class PlayState extends MusicBeatState
 				if (FlxG.save.data.scoreScreen)
 				{
 					persistentUpdate = false;
-					inResults = true;
 					openSubState(subStates[1]);
 				}
 				else
@@ -2910,9 +2791,7 @@ class PlayState extends MusicBeatState
 		}
 
 		if (!daNote.isSustainNote)
-		{
 			ResultsScreen.instance.registerHit(daNote);
-		}
 
 		if (daRating.causeMiss)
 		{
@@ -3037,44 +2916,6 @@ class PlayState extends MusicBeatState
 	var rightHold:Bool = false;
 	var leftHold:Bool = false;
 
-	// THIS FUNCTION JUST FUCKS WIT HELD NOTES AND BOTPLAY
-
-	private function keyShit():Void
-	{
-		var holdArray:Array<Bool> = [controls.LEFT, controls.DOWN, controls.UP, controls.RIGHT];
-		var pressArray:Array<Bool> = [controls.LEFT_P, controls.DOWN_P, controls.UP_P, controls.RIGHT_P];
-		var releaseArray:Array<Bool> = [controls.LEFT_R, controls.DOWN_R, controls.UP_R, controls.RIGHT_R];
-		var keynameArray:Array<String> = ['left', 'down', 'up', 'right'];
-		#if FEATURE_LUAMODCHART
-		if (luaModchart != null)
-		{
-			for (i in 0...pressArray.length)
-			{
-				if (pressArray[i] == true)
-				{
-					luaModchart.executeState('onKeyPressed', [keynameArray[i]]);
-				}
-			};
-
-			for (i in 0...releaseArray.length)
-			{
-				if (releaseArray[i] == true)
-				{
-					luaModchart.executeState('onKeyReleased', [keynameArray[i]]);
-				}
-			};
-		};
-		#end
-
-		// Prevent player input if botplay is on
-		if (PlayStateChangeables.botPlay)
-		{
-			holdArray = [false, false, false, false];
-			pressArray = [false, false, false, false];
-			releaseArray = [false, false, false, false];
-		}
-	}
-
 	public function changeScrollSpeed(mult:Float, time:Float, ease):Void
 	{
 		var newSpeed = 1 * mult;
@@ -3524,12 +3365,6 @@ class PlayState extends MusicBeatState
 	override function beatHit()
 	{
 		super.beatHit();
-
-		if (generatedMusic)
-		{
-			notes.sort(FlxSort.byY, (PlayStateChangeables.useDownscroll ? FlxSort.ASCENDING : FlxSort.DESCENDING));
-		}
-
 		#if FEATURE_LUAMODCHART
 		if (executeModchart && luaModchart != null)
 		{
@@ -3732,6 +3567,9 @@ class PlayState extends MusicBeatState
 		LuaStorage.objects.clear();
 		#end
 
+		@:privateAccess
+		Note._lastValidChecked = null;
+
 		cleanPlayObjects();
 		clearSubs();
 
@@ -3805,6 +3643,8 @@ class PlayState extends MusicBeatState
 	#if FEATURE_HSCRIPT
 	function initScripts()
 	{
+		scripts = new ScriptGroup();
+		scripts.onAddScript.push(onAddScript);
 		if (scripts == null)
 			return;
 
@@ -3843,22 +3683,16 @@ class PlayState extends MusicBeatState
 				var scriptName:String = CoolUtil.getFileStringFromPath(file);
 
 				if (!scriptData.exists(scriptName))
-				{
 					scriptData.set(scriptName, hx);
-				}
 			}
 		}
 
 		for (scriptName => hx in scriptData)
 		{
 			if (scripts.getScriptByTag(scriptName) == null)
-			{
 				scripts.addScript(scriptName).executeString(hx);
-			}
 			else
-			{
 				scripts.getScriptByTag(scriptName).error("Duplicate Script Error!", '$scriptName: Duplicate Script');
-			}
 		}
 	}
 
@@ -3911,10 +3745,6 @@ class PlayState extends MusicBeatState
 		{
 		});
 
-		//  NOTE FUNCTIONS
-		script.set("spawnNote", function(?note:Note)
-		{
-		}); // ! HAS PAUSE
 		script.set("goodNoteHit", function(?note:Note)
 		{
 		});
@@ -3947,6 +3777,14 @@ class PlayState extends MusicBeatState
 			return timer.start(Time, OnComplete, Loops);
 			// actually bullshit. WHY CAN'T YOU DO CREATETIMER NORMALLY???? (crashes doing it normally)
 		});
+
+		script.set("createTweenNum", function(FromValue:Float, ToValue:Float, Duration:Float = 1, ?Options:TweenOptions, ?TweenFunction:Float->Void)
+		{
+			var tween:FlxTween = tweenManager.num(FromValue, ToValue, Duration, Options, TweenFunction);
+			tween.manager = tweenManager;
+			return tween;
+			// actually bullshit. WHY CAN'T YOU DO CREATETWEENNUM NORMALLY???? (crashes doing it normally)
+		});
 		// sex
 		script.set("notesUpdate", function()
 		{
@@ -4005,6 +3843,7 @@ class PlayState extends MusicBeatState
 		// OBJECTS
 		script.set("camGame", camGame);
 		script.set("camHUD", camHUD);
+		script.set("overlayCam", camHUD);
 		script.set("camFollow", camFollow);
 		script.set("camZoom", zoomForTweens);
 
@@ -4025,15 +3864,11 @@ class PlayState extends MusicBeatState
 		script.set("add", function(obj:FlxBasic, ?front:Bool = false)
 		{
 			if (front)
-			{
 				getInstance().add(obj);
-			}
 			else
 			{
 				if (PlayState.instance.isDead)
-				{
 					GameOverSubstate.instance.insert(GameOverSubstate.instance.members.indexOf(GameOverSubstate.instance.bf), obj);
-				}
 				else
 				{
 					var position:Int = PlayState.instance.members.indexOf(PlayState.instance.gfGroup);
@@ -4049,9 +3884,7 @@ class PlayState extends MusicBeatState
 	#end
 
 	public static inline function getInstance()
-	{
 		return PlayState.instance.isDead ? GameOverSubstate.instance : PlayState.instance;
-	}
 
 	public inline function precacheThing(target:String, type:String)
 	{
@@ -4068,7 +3901,6 @@ class PlayState extends MusicBeatState
 
 	public function hideHUD(hidden:Bool)
 	{
-		Debug.logTrace(hidden);
 		healthBar.visible = hidden;
 		iconP1.visible = hidden;
 		iconP2.visible = hidden;
@@ -4117,53 +3949,30 @@ class PlayState extends MusicBeatState
 		{
 			case true:
 				for (i in 0...playerStrums.length)
-				{
 					playerStrums.members[i].texture = 'noteskins/' + texture;
-				}
 				for (note in unspawnNotes)
-				{
 					if (note.mustPress && (note.noteType == null || note.noteType.toLowerCase() == 'normal'))
-					{
 						note.texture = 'noteskins/' + texture;
-					}
-				}
 				for (note in notes)
-				{
 					if (note.mustPress && (note.noteType == null || note.noteType.toLowerCase() == 'normal'))
-					{
 						note.texture = 'noteskins/' + texture;
-					}
-				}
 			case false:
 				for (i in 0...cpuStrums.length)
-				{
 					cpuStrums.members[i].texture = 'noteskins/' + texture;
-				}
 				for (note in unspawnNotes)
-				{
 					if (!note.mustPress && (note.noteType == null || note.noteType.toLowerCase() == 'normal'))
-					{
 						note.texture = 'noteskins/' + texture;
-					}
-				}
 				for (note in notes)
-				{
 					if (!note.mustPress && (note.noteType == null || note.noteType.toLowerCase() == 'normal'))
-					{
 						note.texture = 'noteskins/' + texture;
-					}
-				}
 		}
 	}
 
-	private function destroyNote(daNote:Note)
+	private function destroyNote(note:Note)
 	{
-		daNote.active = false;
-		daNote.visible = false;
-		daNote.kill();
-		notes.remove(daNote, true);
-		daNote.destroy();
-		daNote = null;
+		note.kill();
+		notes.remove(note, true);
+		note.destroy();
 	}
 
 	private function cleanPlayObjects()
@@ -4324,9 +4133,7 @@ class PlayState extends MusicBeatState
 	}
 
 	private function updateCamFollow()
-	{
 		camFollow.set(stageFollow.x, stageFollow.y);
-	}
 
 	private function snapCamFollowToPos(x:Float, y:Float)
 	{
@@ -4349,7 +4156,7 @@ class PlayState extends MusicBeatState
 				if (Stage.staticCam)
 					updateCamFollow();
 
-				switch (Std.int(Math.abs(note.noteData)))
+				switch (note.noteData)
 				{
 					case 0:
 						camNoteX -= camNoteExtend;
@@ -4467,6 +4274,9 @@ class PlayState extends MusicBeatState
 
 	private function initCharacters()
 	{
+		dadMap = new StringMap();
+		boyfriendMap = new StringMap();
+		gfMap = new StringMap();
 		// defaults if no gf was found in chart
 		var gfCheck:String = 'gf';
 
diff --git a/source/kec/states/TitleState.hx b/source/kec/states/TitleState.hx
index 0e1f96af..121fd30c 100644
--- a/source/kec/states/TitleState.hx
+++ b/source/kec/states/TitleState.hx
@@ -66,6 +66,7 @@ class TitleState extends MusicBeatState
 
 		FlxG.sound.playMusic(Paths.music("freakyMenu"));
 		FlxG.sound.music.fadeIn(4, 0, 0.7);
+		Conductor.bpm = 102;
 		if (seenBefore)
 			show();
 		super.create();
diff --git a/source/kec/states/editors/ChartingState.hx b/source/kec/states/editors/ChartingState.hx
index f98b2321..7d51cd34 100644
--- a/source/kec/states/editors/ChartingState.hx
+++ b/source/kec/states/editors/ChartingState.hx
@@ -1,38 +1,8 @@
 package kec.states.editors;
 
+import haxe.ui.backend.flixel.UIState;
 import kec.objects.editor.TextLine;
 import kec.objects.editor.EditorSustain;
-import flixel.addons.display.FlxBackdrop;
-import flixel.util.FlxSort;
-import haxe.ui.components.Button;
-import haxe.ui.components.CheckBox;
-import haxe.ui.components.DropDown;
-import haxe.ui.components.HorizontalSlider;
-import haxe.ui.components.Label;
-import haxe.ui.components.NumberStepper;
-import haxe.ui.components.OptionBox;
-import haxe.ui.components.Spacer;
-import haxe.ui.components.TextField;
-import haxe.ui.components.Toggle;
-import haxe.ui.containers.ContinuousHBox;
-import haxe.ui.containers.Grid;
-import haxe.ui.containers.HBox;
-import haxe.ui.containers.TabView;
-import haxe.ui.containers.VBox;
-import haxe.ui.containers.menus.Menu;
-import haxe.ui.containers.menus.MenuBar;
-import haxe.ui.containers.menus.MenuCheckBox;
-import haxe.ui.containers.menus.MenuItem;
-import haxe.ui.core.Component;
-import haxe.ui.core.Screen;
-import haxe.ui.data.ArrayDataSource;
-import haxe.ui.events.UIEvent;
-import haxe.ui.focus.FocusManager;
-import haxe.ui.notifications.NotificationManager;
-import haxe.ui.notifications.NotificationType;
-import haxe.ui.styles.Style;
-import haxe.ui.themes.Theme;
-import haxe.ui.util.Color;
 import kec.backend.HitSounds;
 import kec.backend.PlayStateChangeables;
 import kec.backend.chart.Event;
@@ -42,7 +12,6 @@ import kec.backend.chart.TimingStruct;
 import kec.backend.util.HelperFunctions;
 import kec.backend.util.NoteStyleHelper;
 import kec.backend.util.Sort;
-import kec.backend.util.Sort;
 import kec.backend.character.CharacterData;
 import kec.objects.CoolText;
 import kec.objects.note.Note;
@@ -57,193 +26,100 @@ import kec.backend.chart.format.Section;
 import kec.objects.editor.EditorNote;
 import kec.objects.editor.EditorGrid;
 import kec.objects.editor.BeatLine;
+import haxe.ui.data.ArrayDataSource;
+import haxe.ui.focus.FocusManager;
+import flixel.util.FlxSort;
 #if FEATURE_FILESYSTEM
 import sys.FileSystem;
 import sys.io.File;
 #end
 
-class ChartingState extends MusicBeatState
+@:build(haxe.ui.ComponentBuilder.build("assets/shared/data/editors/charter.xml"))
+class ChartingState extends UIState
 {
 	public static var instance:ChartingState = null;
 
-	var ui:TabView;
-	var entireUI:VBox;
-	var menu:MenuBar;
-
-	var box:ContinuousHBox;
-	var box2:ContinuousHBox;
-	var box3:ContinuousHBox;
-	var box4:HBox;
-	var box5:ContinuousHBox;
-
-	var vbox1:VBox;
-	var vbox3:VBox;
-	var uiGrid:Grid;
-
-	// Assets
-	var playerDrop:DropDown;
-	var opponentDrop:DropDown;
-	var stageDrop:DropDown;
-	var gfDrop:DropDown;
-	var noteStyleDrop:DropDown;
-
-	// Song
-	var song:TextField;
-	var songName:TextField;
-	var audioFileName:TextField;
-
-	var hasVoices:CheckBox;
-	var isSplit:CheckBox;
-
-	var bpm:NumberStepper;
-	var scrollSpeed:NumberStepper;
-	var instVol:NumberStepper;
-	var vocalVol:NumberStepper;
-	var vocalPVol:NumberStepper;
-	var vocalEVol:NumberStepper;
-	var diffDrop:DropDown;
-
-	// Note
-	var noteShitDrop:DropDown;
-
-	// Section
-	var playerSection:CheckBox;
-	var refreshSec:Button;
-	var clearSec:Button;
-	var swapSec:Button;
-	var duet:Button;
-	var mirror:Button;
-	var copySec:Button;
-	var pasteSec:Button;
-	var clearCopiedNotes:Button;
-
-	var secBox:VBox;
-	var secBox2:VBox;
-	var secGrid:Grid;
-	var secGrid2:Grid;
-
-	// Personal
-	var metronome:MenuCheckBox;
-	var hitsoundsVol:HorizontalSlider;
-	var hitsoundsP:MenuCheckBox;
-	var hitsoundsE:MenuCheckBox;
-	var oppMode:MenuCheckBox;
-
-	var daHitSound:FlxSound;
-
-	// Events
-	var eventDrop:DropDown;
-	var eventTypes:DropDown;
-	var eventAdd:Button;
-	var eventRemove:Button;
-	var eventName:TextField;
-	var eventVal1:TextField;
-	var eventVal2:TextField;
-	var eventPosition:TextField;
-	var eventPos:Button;
-	var eventSave:Button;
-
-	// dfjk
-	var characters:Array<String>;
-	var stages:Array<String>;
-	var gfs:Array<String>;
-	var noteStyles:Array<String>; // noteStyles basically
-	var noteTypes:Array<String>; // noteTypes basically
-	var events:Array<String>; // even- you already know
-
-	var noteType:String = "Normal"; // idfk
-
 	public var SONG:Modern;
+
 	public var lastUpdatedSection:Section = null;
 
 	public static final gridSize:Int = 45; // scale? GRID_SIZE?
+	public static final separatorWidth:Int = 4;
 
-	final notePos = 100; // General Note Pos
-
-	public static final size = 0.5; // general size / spacing of things
-
-	var currentSelectedEventName:String = "";
-	var savedType:String = "BPM Change";
-	var savedValue:String = "100";
-	var savedValue2:String = "1";
-	var currentEventPosition:Float = 0;
-
-	var noteGroup:FlxTypedGroup<EditorNote>;
-	var sustainGroup:FlxTypedGroup<EditorSustain>;
-	private var noteCounter:Int = 0;
-
-	public var selectedBoxes:FlxTypedGroup<ChartingBox>;
-	public var curSelectedNoteObject:EditorNote = null;
-
-	public var copiedNotes:Array<ChartNote> = [];
-	public var pastedNotes:Array<EditorNote> = [];
-	public var deletedNotes:Array<ChartNote> = [];
-	public var lastAction:String = "";
+	public static var lengthInSteps:Int = 0;
+	public static var lengthInBeats:Int = 0;
+	public static var lengthInSections:Int = 0;
 
-	var curSelectedNote:ChartNote;
-	var texts:FlxTypedGroup<TextLine>;
-	var lines:FlxTypedGroup<BeatLine>;
+	public var quantList:Array<Int> = [4, 8, 12, 16, 20, 24, 32, 48, 64, 96, 192];
+	public var curQuant = 3; // 16
+	public var curType = 0;
 
-	var inst:FlxSound;
-	var vocals:FlxSound;
-	var vocalsP:FlxSound;
-	var vocalsE:FlxSound;
+	private var sustainQuant:Float = 1.0;
 
-	var iconP1:HealthIcon;
-	var iconP2:HealthIcon;
+	public var waitingForRelease:Bool = false;
 
-	var player:CharacterData;
-	var opponent:CharacterData;
+	private var maxBeat = 0;
 
-	var lastConductorPos:Float;
-	var strumLine:FlxSprite;
+	public var end:Float = 1.0;
 
-	public static var lengthInSteps:Int = 0;
-	public static var lengthInBeats:Int = 0;
-	public static var lengthInSections:Int = 0;
+	private var paused(default, set):Bool = true;
 
 	public var pitch:Float = 1.0;
 
-	var snap:Bool = true;
-	var defaultSnap:Bool = true;
-
-	public static var quantization:Int = 16;
-	public static var curQuant = 3;
+	private var lastConductorPos:Float;
+	private var snap:Bool = true;
 
-	var curDiff:String = "";
+	private var strumLine:FlxSprite;
+	private var mouse:FlxSprite;
 
-	public var quantList:Array<Int> = [4, 8, 12, 16, 20, 24, 32, 48, 64, 96, 192];
+	public var selectBox:FlxSprite;
 
-	var mouse:FlxSprite;
+	private var savedEvent:Event = null;
+	private var curSelectedNote:ChartNote;
 
-	public var waitingForRelease:Bool = false;
-	public var selectBox:FlxSprite;
+	private var noteGroup:FlxTypedSpriteGroup<EditorNote>;
+	private var sustainGroup:FlxTypedSpriteGroup<EditorSustain>;
 
-	public static var clean:Bool = false;
+	private var texts:FlxTypedGroup<TextLine>;
+	private var lines:FlxTypedGroup<BeatLine>;
 
-	public var selectInitialX:Float = 0;
-	public var selectInitialY:Float = 0;
+	public var selectedBoxes:FlxTypedGroup<ChartingBox>;
+	public var curSelectedNoteObject:EditorNote = null;
 
 	public var infoText:CoolText;
 
-	var sustainQuant:Float = 1.0;
+	private var grid:EditorGrid;
 
 	public var infoBG:FlxSprite;
 	public var notetypetext:CoolText;
 	public var helpText:CoolText;
 
-	var _file:FileReference;
+	private var iconP1:HealthIcon;
+	private var iconP2:HealthIcon;
 
-	public var id:Int = -1;
+	private var inst:FlxSound;
+	private var vocals:FlxSound;
+	private var vocalsP:FlxSound;
+	private var vocalsE:FlxSound;
+	private var hitsound:FlxSound;
 
-	public static final separatorWidth:Int = 4;
+	private var noteCam:FlxCamera;
+	private var uiCam:FlxCamera;
 
-	private var grid:EditorGrid;
-	private var maxBeat = 0;
+	private var player:CharacterData;
+	private var opponent:CharacterData;
+	var curDiff:String = "";
 
-	public var end:Float = 1.0;
+	public var selectInitialX:Float = 0;
+	public var selectInitialY:Float = 0;
 
-	private var paused(default, set):Bool = true;
+	private var noteTypes:Array<String> = null;
+
+	private var _file:FileReference;
+
+	public var id:Int = -1;
+
+	private var noteCounter:Int = 0;
 
 	// one does not realize how much flixel-ui is used until one sees an FNF chart editor. 💀
 
@@ -258,27 +134,24 @@ class ChartingState extends MusicBeatState
 
 		Paths.clearCache();
 
-		ui = new TabView();
-		ui.text = "huh";
-		ui.draggable = FlxG.save.data.moveEditor;
-		ui.height = 300;
-
-		menu = new MenuBar();
-		menu.continuous = true;
-		menu.height = 30;
-		menu.width = FlxG.width;
-
 		FlxG.mouse.visible = true;
 
 		lines = new FlxTypedGroup<BeatLine>();
 		texts = new FlxTypedGroup<TextLine>();
 
-		noteGroup = new FlxTypedGroup<EditorNote>();
-		sustainGroup = new FlxTypedGroup<EditorSustain>();
+		noteGroup = new FlxTypedSpriteGroup<EditorNote>();
+		sustainGroup = new FlxTypedSpriteGroup<EditorSustain>();
+
+		noteCam = FlxG.camera;
+		uiCam = new FlxCamera();
+		uiCam.bgColor.alpha = 0;
+		FlxG.cameras.add(uiCam, false);
+
+		super.create();
 
 		PlayState.inDaPlay = false;
 		SONG = PlayState.SONG;
-		loadSong(SONG.audioFile, false);
+		loadAudio(SONG.songId, false);
 
 		inst.time = 0;
 		Conductor.rate = 1;
@@ -293,7 +166,7 @@ class ChartingState extends MusicBeatState
 		lengthInBeats = Math.round(TimingStruct.getBeatFromTime(inst.length));
 		lengthInSteps = lengthInBeats * 4;
 		lengthInSections = Std.int(lengthInBeats / 4);
-		Debug.logTrace('Total Beats ${lengthInBeats}. Total Steps ${lengthInSteps} Probable Length In Sections ${lengthInSections}');
+		Debug.logTrace('Total Beats ${lengthInBeats}. Total Steps ${lengthInSteps}. Length In Sections ${lengthInSections}');
 		currentSection = getSectionByTime(0);
 
 		curSection = 0;
@@ -303,18 +176,12 @@ class ChartingState extends MusicBeatState
 		Constants.cpuNoteskinSprite = NoteStyleHelper.generateNoteskinSprite(FlxG.save.data.cpuNoteskin);
 		Constants.noteskinPixelSprite = NoteStyleHelper.generatePixelSprite(FlxG.save.data.noteskin);
 
+		noteTypes = CoolUtil.coolTextFile(Paths.txt('data/noteTypeList'));
+
 		var bg:FlxSprite = new FlxSprite().loadGraphic(Paths.image('menuDesat'));
 		bg.scrollFactor.set();
 		bg.color = 0xFF111111;
 		add(bg);
-
-		characters = CoolUtil.coolTextFile(Paths.txt('data/characterList'));
-		gfs = CoolUtil.coolTextFile(Paths.txt('data/gfVersionList'));
-		stages = CoolUtil.coolTextFile(Paths.txt('data/stageList'));
-		noteTypes = CoolUtil.coolTextFile(Paths.txt('data/noteTypeList'));
-		noteStyles = CoolUtil.coolTextFile(Paths.txt('data/songStyleList'));
-		events = CoolUtil.coolTextFile(Paths.txt('data/eventList'));
-
 		createGrid();
 
 		regenerateLines();
@@ -326,6 +193,7 @@ class ChartingState extends MusicBeatState
 
 		iconP2 = new HealthIcon(opponent.icon, false);
 		iconP1 = new HealthIcon(player.icon, true);
+		iconP1.allowedToBop = iconP2.allowedToBop = true;
 
 		iconP1.size.set(0.75, 0.75);
 		iconP2.size.set(0.75, 0.75);
@@ -375,21 +243,6 @@ class ChartingState extends MusicBeatState
 		add(iconP1);
 		add(iconP2);
 
-		entireUI = new VBox();
-		menuBarShit();
-		entireUI.addComponent(menu);
-		var tempSpacer = new Spacer();
-		tempSpacer.height = 420;
-		entireUI.addComponent(tempSpacer);
-		entireUI.addComponent(ui);
-
-		addTabs();
-		addAssetUI();
-		addNoteUI();
-		addSectionUI();
-		addSongUI();
-		addEventUI();
-
 		selectedBoxes = new FlxTypedGroup();
 		add(selectedBoxes);
 
@@ -400,20 +253,27 @@ class ChartingState extends MusicBeatState
 		add(notetypetext);
 		add(helpText);
 
-		add(entireUI);
-
 		selectBox = new FlxSprite(0, 0).makeGraphic(1, 1, FlxColor.fromRGB(173, 216, 230));
 		selectBox.visible = false;
 		selectBox.alpha = 0.4;
 		add(selectBox);
 
+		if (FlxG.save.data.hitSound == 0)
+			hitsound = new FlxSound().loadEmbedded(Paths.sound('hitsounds/snap'));
+		else
+			hitsound = new FlxSound().loadEmbedded(Paths.sound('hitsounds/${HitSounds.getSoundByID(FlxG.save.data.hitSound).toLowerCase()}'));
+
+		hitsound.autoDestroy = false;
+
 		id = Lib.setInterval(backupChart, 5 * 60 * 1000);
 
 		#if FEATURE_DISCORD
 		kec.backend.Discord.changePresence("Chart Editor", "Charting : " + SONG.songName, null, true);
 		#end
 
-		super.create();
+		initHUI();
+
+		root.camera = uiCam;
 	}
 
 	var updateFrame = 0;
@@ -470,33 +330,18 @@ class ChartingState extends MusicBeatState
 			Conductor.songPosition = inst.time;
 		}
 
-		final lerpVal:Float = CoolUtil.boundTo(1 - (elapsed * 12), 0, 1);
-		strumLine.y = FlxMath.lerp(getYFromTime(inst.time), strumLine.y, lerpVal);
-		// strumLine.y = getYFromTime(inst.time);
-
-		var weird = getSectionByTime(inst.time);
-
-		if (weird != null)
-		{
-			if (lastUpdatedSection != getSectionByTime(inst.time))
-			{
-				lastUpdatedSection = weird;
-				playerSection.selected = weird.mustHitSection;
-			}
-		}
-
-		var interacting:Bool = Screen.instance.hasComponentUnderPoint(FlxG.mouse.screenX, FlxG.mouse.screenY);
+		// final lerpVal:Float = CoolUtil.boundTo(1 - (elapsed * 12), 0, 1);
+		// strumLine.y = FlxMath.lerp(getYFromTime(inst.time), strumLine.y, lerpVal);
+		strumLine.y = getYFromTime(Conductor.songPosition);
 		var mouseX:Float = quantizePos(FlxG.mouse.x - grid.x);
 		mouse.x = Math.min(grid.x + mouseX + separatorWidth * Math.floor(mouseX / gridSize / 4), grid.x + grid.width);
 		mouse.y = FlxMath.bound(getMouseY(), 0, end - gridSize);
-		mouse.visible = (mouseValid() && !interacting);
+		mouse.visible = mouseValid();
 
 		if (FlxG.mouse.justPressed && !waitingForRelease)
 		{
 			if (!FlxG.keys.pressed.CONTROL && mouse.visible)
-			{
 				checkNoteSpawn();
-			}
 		}
 
 		if (FlxG.mouse.pressed && FlxG.keys.pressed.CONTROL)
@@ -532,9 +377,7 @@ class ChartingState extends MusicBeatState
 			noteGroup.forEachAlive(function(n:EditorNote)
 			{
 				if (n.overlaps(selectBox) && !n.selected)
-				{
 					selectNote(n);
-				}
 			});
 			selectBox.visible = false;
 		}
@@ -563,14 +406,22 @@ class ChartingState extends MusicBeatState
 			else if ((FlxG.keys.justPressed.D || FlxG.keys.justPressed.RIGHT) && !FlxG.keys.pressed.CONTROL && !FlxG.keys.pressed.ALT)
 				goToSection(curSection + 1);
 
-			if (FlxG.keys.justPressed.C)
+			if (FlxG.keys.pressed.CONTROL && FlxG.keys.justPressed.BACKSPACE)
+				selectedBoxes.forEachAlive(function(b:ChartingBox)
+				{
+					deleteNote(b.connectedNote, false);
+					b.connectedNote.selected = false;
+					b.kill();
+				});
+
+			if (FlxG.keys.pressed.ALT && FlxG.keys.justPressed.LEFT)
 			{
 				curQuant--;
 				if (curQuant < 0)
 					curQuant = quantList.length - 1;
-			}
+			} // fard
 
-			if (FlxG.keys.justPressed.V)
+			if (FlxG.keys.pressed.ALT && FlxG.keys.justPressed.RIGHT)
 			{
 				curQuant++;
 				if (curQuant > quantList.length - 1)
@@ -588,85 +439,6 @@ class ChartingState extends MusicBeatState
 					sustainQuant += 0.1;
 			}
 
-			if (FlxG.keys.pressed.CONTROL && !FlxG.keys.pressed.ALT && FlxG.keys.justPressed.C)
-			{
-				if (selectedBoxes.members.length != 0)
-				{
-					copiedNotes = [];
-					selectedBoxes.forEachAlive(function(i:ChartingBox)
-					{
-						copiedNotes.push({
-							time: i.connectedNote.time,
-							data: i.connectedNote.rawData,
-							length: i.connectedNote.holdLength,
-							type: i.connectedNote.type
-						});
-					});
-
-					var firstNote = copiedNotes[0].time;
-
-					for (i in copiedNotes) // normalize the notes
-						i.time = i.time - firstNote;
-				}
-			}
-
-			if (FlxG.keys.pressed.CONTROL && !FlxG.keys.pressed.ALT && FlxG.keys.justPressed.V)
-			{
-				if (copiedNotes.length != 0)
-				{
-					destroyBoxes();
-					pasteNotesFromArray(copiedNotes);
-
-					lastAction = "paste";
-				}
-			}
-
-			if (FlxG.keys.pressed.CONTROL && !FlxG.keys.pressed.ALT && FlxG.keys.justPressed.Z)
-			{
-				switch (lastAction)
-				{
-					case "paste":
-						if (pastedNotes.length != 0)
-						{
-							for (i in pastedNotes)
-							{
-								deleteNote(i);
-							}
-
-							pastedNotes = [];
-						}
-					case "delete":
-						if (deletedNotes.length != 0)
-						{
-							pasteNotesFromArray(deletedNotes, false);
-							deletedNotes = [];
-						}
-				}
-			}
-
-			if (FlxG.keys.pressed.CONTROL && !FlxG.keys.pressed.ALT && FlxG.keys.justPressed.BACKSPACE)
-			{
-				lastAction = "delete";
-				var notesToBeDeleted = [];
-				deletedNotes = [];
-
-				selectedBoxes.forEachAlive(function(i:ChartingBox)
-				{
-					deletedNotes.push({
-						time: i.connectedNote.time,
-						data: i.connectedNote.rawData,
-						length: i.connectedNote.holdLength,
-						type: i.connectedNote.type,
-					});
-					notesToBeDeleted.push(i.connectedNote);
-				});
-
-				for (i in notesToBeDeleted)
-				{
-					deleteNote(i);
-				}
-			}
-
 			if (FlxG.keys.justPressed.UP || FlxG.keys.justPressed.DOWN)
 			{
 				var offsetSteps = FlxG.keys.pressed.CONTROL ? 16 : 1;
@@ -697,22 +469,17 @@ class ChartingState extends MusicBeatState
 
 			if (!FlxG.keys.pressed.ALT && !FlxG.keys.pressed.CONTROL && FlxG.keys.justPressed.Z)
 			{
-				noteShitDrop.selectedIndex--;
-				if (noteShitDrop.selectedIndex < 0)
-				{
-					noteShitDrop.selectedIndex = noteTypes.length - 1;
-				}
-				noteType = noteTypes[noteShitDrop.selectedIndex];
+				curType--;
+				if (curType < 0)
+					curType = noteTypes.length - 1;
 				updateNotetypeText();
 			}
 
 			if (!FlxG.keys.pressed.ALT && !FlxG.keys.pressed.CONTROL && FlxG.keys.justPressed.X)
 			{
-				noteShitDrop.selectedIndex++;
-				if (noteShitDrop.selectedIndex == noteTypes.length)
-					noteShitDrop.selectedIndex = 0;
-
-				noteType = noteTypes[noteShitDrop.selectedIndex];
+				curType++;
+				if (curType > noteTypes.length - 1)
+					curType = 0;
 				updateNotetypeText();
 			}
 
@@ -730,6 +497,7 @@ class ChartingState extends MusicBeatState
 						vocalsE.stop();
 					}
 				}
+				setSongData();
 				MusicBeatState.switchState(new PlayState());
 				Lib.clearInterval(id);
 			}
@@ -760,6 +528,24 @@ class ChartingState extends MusicBeatState
 				scroll(FlxG.mouse.wheel);
 		}
 
+		while (noteCounter < currentSection.sectionNotes.length)
+		{
+			final chartNote = currentSection.sectionNotes[noteCounter];
+			var note:EditorNote = noteGroup.recycle(EditorNote);
+			note.setup(chartNote.time, chartNote.data, chartNote.length, chartNote.type, TimingStruct.getBeatFromTime(chartNote.time));
+			note.setGraphicSize(gridSize, gridSize);
+			note.updateHitbox();
+			note.setPosition(grid.x + (gridSize * chartNote.data), getYFromTime(chartNote.time));
+			if (note.holdLength > 0)
+			{
+				var sustain:EditorSustain = sustainGroup.recycle(EditorSustain);
+				sustain.setup(note.x + 20, note.y + gridSize, 8, Math.floor((getYFromTime(note.time + note.holdLength)) - note.y));
+				note.sustain = sustain;
+			}
+			noteCounter++;
+			noteGroup.sort(FlxSort.byY, FlxSort.ASCENDING);
+		}
+
 		var playedSound:Array<Bool> = [false, false, false, false, false, false, false, false];
 		noteGroup.forEachAlive(function(note:EditorNote)
 		{
@@ -774,13 +560,10 @@ class ChartingState extends MusicBeatState
 					{
 						if ((FlxG.save.data.playHitsounds && playerNote) || (FlxG.save.data.playHitsoundsE && !playerNote))
 						{
-							if (FlxG.save.data.hitSound == 0)
-								daHitSound = new FlxSound().loadEmbedded(Paths.sound('hitsounds/snap'));
-							else
-								daHitSound = new FlxSound()
-									.loadEmbedded(Paths.sound('hitsounds/${HitSounds.getSoundByID(FlxG.save.data.hitSound).toLowerCase()}'));
-							daHitSound.volume = hitsoundsVol.pos;
-							daHitSound.play().pan = noteDataToCheck < 4 ? -0.3 : 0.3;
+							hitsound.stop();
+							hitsound.time = 0;
+							hitsound.volume = .5;
+							hitsound.play().pan = noteDataToCheck < 4 ? -0.3 : 0.3;
 							playedSound[data] = true;
 						}
 						data = noteDataToCheck;
@@ -789,22 +572,6 @@ class ChartingState extends MusicBeatState
 			}
 		});
 
-		while (noteCounter < currentSection.sectionNotes.length)
-		{
-			final chartNote = currentSection.sectionNotes[noteCounter];
-			var note:EditorNote = noteGroup.recycle(EditorNote);
-			note.setup(chartNote.time, chartNote.data, chartNote.length, chartNote.type, TimingStruct.getBeatFromTime(chartNote.time));
-			note.setGraphicSize(gridSize, gridSize);
-			note.updateHitbox();
-			note.setPosition(grid.x + (gridSize * chartNote.data), getYFromTime(chartNote.time));
-			if (note.holdLength > 0)
-			{
-				var sustain:EditorSustain = sustainGroup.recycle(EditorSustain);
-				sustain.setup(note.x + 20, note.y + gridSize, 8, Math.floor((getYFromTime(note.time + note.holdLength)) - note.y));
-			}
-			noteCounter++;
-		}
-
 		infoText.text = "Song : "
 			+ SONG.songName
 			+ "\nDifficulty : "
@@ -830,7 +597,6 @@ class ChartingState extends MusicBeatState
 			+ snap;
 		infoText.updateHitbox();
 		lastConductorPos = Conductor.songPosition;
-		songShit();
 		super.update(elapsed);
 	}
 
@@ -858,7 +624,6 @@ class ChartingState extends MusicBeatState
 			if (seg != null)
 			{
 				var start:Float = (i.beat - seg.startBeat) / (seg.bpm / 60);
-
 				posi = seg.startTime + start;
 			}
 
@@ -879,43 +644,32 @@ class ChartingState extends MusicBeatState
 		}
 	}
 
-	private function addNote():Void
+	private function addNote()
 	{
 		destroyBoxes();
-
-		var strum = (mouse.y);
-		var spawnTime = strum;
-		var noteData:Int = Math.floor((mouse.x - grid.x) / gridSize);
-		var noteType = noteTypes[noteShitDrop.selectedIndex];
-		var playerNote:Bool = (noteData > 3);
-		var sec = getSectionByTime(strum);
-
-		if (PlayStateChangeables.opponentMode)
-			playerNote = !playerNote;
-
-		sec.sectionNotes.push({
-			time: spawnTime,
+		final strumTime = getTimeFromY(mouse.y);
+		final noteData:Int = Math.floor((mouse.x - grid.x) / gridSize);
+		final section = getSectionByTime(strumTime);
+		final chartNote:ChartNote = {
+			time: strumTime,
 			data: noteData,
 			length: 0,
-			type: noteType
-		}); // retarded ass note saving
-
-		Debug.logTrace("Note Data : " + noteData + " StrumTime : " + spawnTime);
-
+			type: "Normal"
+		};
 		var note:EditorNote = noteGroup.recycle(EditorNote);
-		note.setup(spawnTime, noteData, 0, noteType, TimingStruct.getBeatFromTime(spawnTime));
+		note.setup(chartNote.time, chartNote.data, chartNote.length, chartNote.type, TimingStruct.getBeatFromTime(chartNote.time));
 		note.setGraphicSize(gridSize, gridSize);
 		note.updateHitbox();
-		note.x = grid.x + Math.floor(noteData * gridSize) + separatorWidth;
-		if (noteData < 4)
-			note.x -= separatorWidth;
-		note.y = Math.floor(getYFromTime(spawnTime));
-
-		curSelectedNote = sec.sectionNotes[sec.sectionNotes.length - 1];
-		curSelectedNoteObject = note;
+		note.setPosition(grid.x + (gridSize * chartNote.data), getYFromTime(chartNote.time));
+		note.camera = noteGroup.camera;
+		noteCounter++;
+		section.sectionNotes.push(chartNote);
+		sortNotes(section);
+		noteGroup.sort(FlxSort.byY, FlxSort.ASCENDING);
+		Debug.logTrace("Adding Note At " + strumTime);
 		createBox(note.x, note.y, note);
-		note.selected = true;
-		curSelectedNoteObject.selected = true;
+		curSelectedNote = chartNote;
+		curSelectedNoteObject = note;
 	}
 
 	function selectNote(note:EditorNote):Void
@@ -943,23 +697,27 @@ class ChartingState extends MusicBeatState
 		}
 	}
 
-	function deleteNote(existingNote:EditorNote):Void
+	private function deleteNote(n:EditorNote, removeBoxes:Bool = true)
 	{
-		destroyBoxes();
-		var sec = getSectionByTime(existingNote.time);
-		var i:Int = sec.sectionNotes.length;
+		if (removeBoxes)
+			destroyBoxes();
+
+		final section = getSectionByTime(n.time);
+		var i:Int = section.sectionNotes.length;
 		while (--i > -1)
 		{
-			if (sec.sectionNotes[i].time == existingNote.time && sec.sectionNotes[i].data == existingNote.rawData)
-				sec.sectionNotes.remove(sec.sectionNotes[i]);
+			if (section.sectionNotes[i].time == n.time && section.sectionNotes[i].data == n.rawData)
+			{
+				Debug.logTrace("Removing Note At " + n.time);
+				section.sectionNotes.remove(section.sectionNotes[i]);
+			}
 		}
-		// thanks Chris(Dimensionscape) from the FNF thread
-		existingNote.kill();
-		if (existingNote.holdLength > 0)
-			existingNote.noteCharterObject.kill();
+		sortNotes(section);
 
-		curSelectedNote = null;
-		// Debug.logTrace("tryna delete note");
+		if (n.sustain != null)
+			n.sustain.kill();
+
+		n.kill();
 	}
 
 	function createBox(x:Float, y:Float, note:EditorNote)
@@ -985,30 +743,40 @@ class ChartingState extends MusicBeatState
 		sustainGroup.clear();
 		// I hate having things run in update all the time but fuck it
 		backupChart();
-		copiedNotes = null;
-		pastedNotes = null;
-		deletedNotes = null;
 		curSelectedNoteObject = null;
 		curSelectedNote = null;
 		selectBox = null;
-		events = null;
-		characters = null;
-		stages = null;
-		gfs = null;
-		noteStyles = null;
 		noteTypes = null;
-	
+
 		destroyBoxes();
 		super.destroy();
 	}
 
 	function changeNoteSustain(value:Float):Void
 	{
-		if (curSelectedNote == null)
-			return;
+		final halfStep:Float = (Conductor.stepCrochet * 0.5);
+		final val:Float = Math.round(value / halfStep) * halfStep;
+		final note = curSelectedNoteObject;
+		note.holdLength = note.holdLength + val;
 
-		curSelectedNote.length += Math.ceil(value);
-		curSelectedNote.length = Math.max(curSelectedNote.length, 0);
+		if (note.holdLength <= 0)
+		{
+			note.holdLength = 0;
+			curSelectedNote.length = note.holdLength;
+			if (note.sustain != null)
+				note.sustain.kill();
+			return;
+		}
+		Debug.logTrace(note.holdLength);
+		if (note.sustain == null || !note.sustain.alive)
+		{
+			var sustain:EditorSustain = sustainGroup.recycle(EditorSustain);
+			sustain.setup(note.x + 20, note.y + gridSize, 8, Math.floor((getYFromTime(note.time + note.holdLength)) - note.y));
+			note.sustain = sustain;
+		}
+		else
+			note.sustain.setup(note.x + 20, note.y + gridSize, 8, Math.floor((getYFromTime(note.time + note.holdLength)) - note.y));
+		curSelectedNote.length = note.holdLength;
 	}
 
 	function offsetSelectedNotes(offset:Float)
@@ -1049,36 +817,6 @@ class ChartingState extends MusicBeatState
 		// actually its broken either way because theres a ghost note after offsetting sometimes. updateGrid anyway.
 	}
 
-	function pasteNotesFromArray(array:Array<ChartNote>, fromStrum:Bool = true)
-	{
-		if (copiedNotes.length < 0)
-			return;
-		else
-		{
-			for (i in array)
-			{
-				var strum:Float = i.time;
-				if (fromStrum)
-					strum += Conductor.songPosition;
-				var section = 0;
-				for (ii in SONG.notes)
-				{
-					if (ii.startTime <= strum && ii.endTime > strum)
-					{
-						// alright we're in this section lets paste the note here.
-						ii.sectionNotes.push({
-							time: strum,
-							data: i.data,
-							length: i.length,
-							type: i.type
-						});
-					}
-					section++;
-				}
-			}
-		}
-	}
-
 	function containsName(name:String, events:Array<Event>):Event
 	{
 		for (i in events)
@@ -1128,7 +866,7 @@ class ChartingState extends MusicBeatState
 		inst.time = (data.startTime + ((beat - data.startBeat) / (data.bpm / 60))) * 1000;
 		var sec = getSectionByTime(inst.time);
 		curSection = section;
-		Debug.logTrace("Going too " + inst.time + " | " + section + " | Which is at " + beat + " | Section Index " + sec.index);
+		Debug.logTrace("Going too " + inst.time + " | Which is at " + beat + " | Section Index " + sec.index);
 
 		if (inst.time < 0)
 			inst.time = 0;
@@ -1146,7 +884,7 @@ class ChartingState extends MusicBeatState
 
 	function updateNotetypeText()
 	{
-		notetypetext.text = "Note Type: " + noteType;
+		notetypetext.text = "Note Type: " + noteTypes[curType];
 		notetypetext.updateHitbox();
 	}
 
@@ -1165,95 +903,47 @@ class ChartingState extends MusicBeatState
 		File.saveContent('${Sys.getCwd()}/backups/${SONG.songId + dateNow}.json', song);
 	}
 
-	function loadSong(daSong:String, reloadFromFile:Bool = false):Void
+	function loadAudio(daSong:String, reloadFromFile:Bool = false):Void
 	{
-		inst = FlxG.sound.load(Paths.inst(SONG.audioFile));
-		if (inst != null)
-		{
-			inst.stop();
-		}
 		if (reloadFromFile)
 		{
-			var diff:String = CoolUtil.getSuffixFromDiff(curDiff);
-			SONG = Song.conversionChecks(Song.loadFromJson(SONG.songId, diff));
-		}
-		try
-		{
-			if (!SONG.splitVoiceTracks)
-			{
-				if (SONG.needsVoices)
-					vocals = new FlxSound().loadEmbedded(Paths.voices(SONG.audioFile));
-				else
-					vocals = new FlxSound();
-
-				FlxG.sound.list.add(vocals);
-			}
-			else
+			if (!Song.doesChartExist(daSong, CoolUtil.getSuffixFromDiff(CoolUtil.difficulties[PlayState.storyDifficulty])))
 			{
-				if (SONG.needsVoices)
-				{
-					vocalsP = new FlxSound().loadEmbedded(Paths.voices(SONG.audioFile, 'P'));
-					vocalsE = new FlxSound().loadEmbedded(Paths.voices(SONG.audioFile, 'E'));
-				}
-				else
-				{
-					vocalsP = new FlxSound();
-					vocalsE = new FlxSound();
-				}
-				FlxG.sound.list.add(vocalsP);
-				FlxG.sound.list.add(vocalsE);
+				Debug.logWarn("Couldn't Find Chart For " + daSong + " With A Difficulty Of " + CoolUtil.difficulties[PlayState.storyDifficulty]);
+				return;
 			}
+			SONG = Song.loadFromJson(daSong, CoolUtil.getSuffixFromDiff(CoolUtil.difficulties[PlayState.storyDifficulty]));
+			PlayState.SONG = SONG;
+			MusicBeatState.switchState(new ChartingState());
 		}
-		catch (e)
-		{
-			vocals = new FlxSound();
-			vocalsP = new FlxSound();
-			vocalsE = new FlxSound();
-			FlxG.sound.list.add(vocalsP);
-			FlxG.sound.list.add(vocalsE);
-			FlxG.sound.list.add(vocals);
-			SONG.splitVoiceTracks = false;
-			Debug.logTrace("Your Song Doesn't Have A Voice File Or Something Else. Make Sure Your Song Has The Correct Audio." + e);
-		}
-		FlxG.sound.list.add(inst);
 
+		final audioFile:String = SONG.audioFile;
+
+		inst = new FlxSound().loadEmbedded(Paths.inst(audioFile));
 		inst.play();
 		inst.pause();
-		if (!SONG.splitVoiceTracks)
-		{
-			vocals.play();
-			vocals.pause();
-		}
-		else
-		{
-			vocalsP.play();
-			vocalsE.play();
-			vocalsP.pause();
-			vocalsE.pause();
-		}
-	}
-
-	function loadAutosave():Void
-	{
-		var autoSaveData = Json.parse(FlxG.save.data.autosave);
-
-		var json = {
-			"song": SONG
-		};
-
-		var data:String = haxe.Json.stringify(json, null);
+		FlxG.sound.list.add(inst);
 
-		var data:Modern = cast autoSaveData;
-		var meta:SongMeta = {};
-		var name:String = data.songId;
-		if (autoSaveData.song != null)
+		vocals = new FlxSound();
+		vocalsP = new FlxSound();
+		vocalsE = new FlxSound();
+		switch (SONG.splitVoiceTracks)
 		{
-			meta = autoSaveData.songMeta != null ? cast autoSaveData.songMeta : {};
+			case true:
+				vocalsP.loadEmbedded(Paths.voices(audioFile, 'P'));
+				vocalsE.loadEmbedded(Paths.voices(audioFile, 'E'));
+				vocalsP.play();
+				vocalsP.pause();
+				vocalsE.play();
+				vocalsE.pause();
+			case false:
+				vocals.loadEmbedded(Paths.voices(audioFile));
+				vocals.play();
+				vocals.pause();
 		}
-
-		PlayState.SONG = Song.parseJSONshit(data.songId, data, meta);
-		MusicBeatState.switchState(new ChartingState());
-		Lib.clearInterval(id);
+		FlxG.sound.list.add(vocals);
+		FlxG.sound.list.add(vocalsP);
+		FlxG.sound.list.add(vocalsE);
 	}
 
 	function loadJson(songId:String, diff:String):Void
@@ -1262,30 +952,22 @@ class ChartingState extends MusicBeatState
 		{
 			PlayState.storyDifficulty = CoolUtil.difficulties.indexOf(diff);
 			PlayState.SONG = Song.loadFromJson(songId.toLowerCase(), CoolUtil.getSuffixFromDiff(diff));
-
-			Debug.logTrace(songId);
-			// mustCleanMem = true;
-
+			Debug.logTrace('$songId $diff');
 			MusicBeatState.switchState(new ChartingState());
 			Lib.clearInterval(id);
 		}
 		catch (e)
 		{
-			NotificationManager.instance.addNotification({
-				title: "Error Changing Difficulty.",
-				body: "Make Sure A Difficulty Exists For The One You Want To Change To.",
-				type: NotificationType.Error
-			});
 			Debug.logError('Make Sure You Have A Valid JSON To Load. A Possible Solution Is Setting The Difficulty To Normal. Error: $e');
 			return;
 		}
 	}
 
-	private function saveLevel()
+	private function saveChart()
 	{
 		SONG.chartVersion = Constants.chartVer;
 
-		var data:String = haxe.Json.stringify(SONG, null);
+		final data:String = haxe.Json.stringify(SONG, null).trim();
 
 		if ((data != null) && (data.length > 0))
 		{
@@ -1303,11 +985,6 @@ class ChartingState extends MusicBeatState
 		_file.removeEventListener(OpenFlEvent.CANCEL, onSaveCancel);
 		_file.removeEventListener(IOErrorEvent.IO_ERROR, onSaveError);
 		_file = null;
-		NotificationManager.instance.addNotification({
-			title: "Chart Saved.",
-			body: "Chart Saved Successfully.",
-			type: NotificationType.Success,
-		});
 	}
 
 	/**
@@ -1319,11 +996,6 @@ class ChartingState extends MusicBeatState
 		_file.removeEventListener(OpenFlEvent.CANCEL, onSaveCancel);
 		_file.removeEventListener(IOErrorEvent.IO_ERROR, onSaveError);
 		_file = null;
-		NotificationManager.instance.addNotification({
-			title: "Chart Save Cancelled.",
-			body: "Cancelled Saving Chart.",
-			type: NotificationType.Info
-		});
 	}
 
 	/**
@@ -1336,1170 +1008,43 @@ class ChartingState extends MusicBeatState
 		_file.removeEventListener(IOErrorEvent.IO_ERROR, onSaveError);
 		_file = null;
 		FlxG.log.error("Problem saving Level data");
-		NotificationManager.instance.addNotification({
-			title: "Error Saving Chart.",
-			body: "There Has Been An Error Saving The Chart.",
-			type: NotificationType.Error
-		});
 	}
 
-	private function songShit()
+	private function setSongData()
 	{
 		try
 		{
-			if (SONG != null)
-			{
-				SONG.player1 = playerDrop.text;
-				SONG.player2 = opponentDrop.text;
-				SONG.gfVersion = gfDrop.text;
-				SONG.stage = stageDrop.text;
-				SONG.style = noteStyleDrop.text;
-
-				SONG.songId = song.text;
-				SONG.audioFile = audioFileName.text;
-				SONG.songName = songName.text;
-			}
+			SONG.player1 = playerSelect.text;
+			SONG.player2 = opponentSelect.text;
+			SONG.gfVersion = gfSelect.text;
+			SONG.stage = stageSelect.text;
+			SONG.style = styleSelect.text;
+
+			SONG.songId = dataID.text;
+			SONG.audioFile = dataAudio.text;
+			SONG.songName = dataName.text;
 		}
 	}
 
-	function addAssetUI()
+	override function sectionHit()
 	{
-		var vbox1:VBox = new VBox();
-		var vbox2:VBox = new VBox();
-		var grid = new Grid();
-
-		playerDrop = new DropDown();
-		playerDrop.text = SONG.player1;
-		playerDrop.width = 100;
-
-		var p1Label = new Label();
-		p1Label.text = "Player";
-		p1Label.verticalAlign = "center";
-
-		opponentDrop = new DropDown();
-		opponentDrop.text = SONG.player2;
-		opponentDrop.width = 100;
+		super.sectionHit();
+		if (curSection < 0)
+			return;
 
-		var p2Label = new Label();
-		p2Label.text = "Opponent";
-		p2Label.verticalAlign = "center";
+		noteGroup.forEachAlive(function(n:EditorNote) n.kill());
+		sustainGroup.forEachAlive(function(n:EditorSustain) n.kill());
+		sectionMustHit.selected = currentSection.mustHitSection;
+		noteCounter = 0;
+	}
 
-		gfDrop = new DropDown();
-		gfDrop.text = SONG.gfVersion;
-		gfDrop.width = 75;
+	override function beatHit()
+	{
+		super.beatHit();
 
-		var gfLabel = new Label();
-		gfLabel.text = "GF";
-		gfLabel.verticalAlign = "center";
-
-		stageDrop = new DropDown();
-		stageDrop.text = SONG.stage;
-		stageDrop.width = 100;
-
-		var stageLabel = new Label();
-		stageLabel.text = "Stage";
-		stageLabel.verticalAlign = "center";
-
-		noteStyleDrop = new DropDown();
-		noteStyleDrop.text = SONG.style;
-		noteStyleDrop.width = 100;
-
-		var nsLabel = new Label();
-		nsLabel.text = "Song Style";
-		nsLabel.verticalAlign = "center";
-
-		var ds = new ArrayDataSource<Dynamic>();
-		for (c in 0...characters.length)
-		{
-			ds.add(characters[c]);
-		}
-		playerDrop.dataSource = ds;
-		opponentDrop.dataSource = ds;
-
-		var gfList = new ArrayDataSource<Dynamic>();
-		for (gf in 0...gfs.length)
-		{
-			gfList.add(gfs[gf]);
-		}
-		gfDrop.dataSource = gfList;
-
-		var stageList = new ArrayDataSource<Dynamic>();
-		for (stage in 0...stages.length)
-		{
-			stageList.add(stages[stage]);
-		}
-		stageDrop.dataSource = stageList;
-
-		var styleList = new ArrayDataSource<Dynamic>();
-		for (style in 0...noteStyles.length)
-		{
-			styleList.add(noteStyles[style]);
-		}
-		noteStyleDrop.dataSource = styleList;
-
-		vbox1.addComponent(p1Label);
-		vbox1.addComponent(playerDrop);
-		vbox2.addComponent(p2Label);
-		vbox2.addComponent(opponentDrop);
-		vbox2.addComponent(stageLabel);
-		vbox2.addComponent(stageDrop);
-		vbox1.addComponent(gfLabel);
-		vbox1.addComponent(gfDrop);
-		vbox1.addComponent(nsLabel);
-		vbox1.addComponent(noteStyleDrop);
-
-		grid.addComponent(vbox1);
-		grid.addComponent(vbox2);
-
-		box.addComponent(grid);
-	}
-
-	function addNoteUI()
-	{
-		noteShitDrop = new DropDown();
-		noteShitDrop.text = "Normal";
-		noteShitDrop.width = 100;
-
-		var typeList = new ArrayDataSource<Dynamic>();
-		for (type in 0...noteTypes.length)
-		{
-			typeList.add(noteTypes[type]);
-		}
-		noteShitDrop.dataSource = typeList;
-		noteShitDrop.selectedIndex = 0;
-		noteShitDrop.onChange = function(e)
-		{
-			noteType = noteTypes[noteShitDrop.selectedIndex];
-		}
-
-		var typeLabel = new Label();
-		typeLabel.text = "Note Type";
-		typeLabel.verticalAlign = "center";
-
-		var quantiNotes = new CheckBox();
-		quantiNotes.text = "Color Quant";
-		quantiNotes.selected = FlxG.save.data.stepMania;
-		quantiNotes.onClick = function(e)
-		{
-			FlxG.save.data.stepMania = !FlxG.save.data.stepMania;
-		}
-
-		box2.addComponent(noteShitDrop);
-		box2.addComponent(typeLabel);
-		box2.addComponent(quantiNotes);
-	}
-
-	function addSectionUI()
-	{
-		secBox = new VBox();
-		secBox2 = new VBox();
-		secGrid = new Grid();
-		secGrid2 = new Grid();
-
-		playerSection = new CheckBox();
-		playerSection.text = "Camera Focus P1";
-		playerSection.selected = true;
-		playerSection.onClick = function(e)
-		{
-			var sect = lastUpdatedSection;
-
-			if (sect == null)
-				return;
-
-			sect.mustHitSection = playerSection.selected;
-		}
-
-		refreshSec = new Button();
-		refreshSec.text = "Refresh All Sections";
-		refreshSec.onClick = function(e)
-		{
-			var section = getSectionByTime(Conductor.songPosition);
-
-			if (section == null)
-				return;
-
-			playerSection.selected = section.mustHitSection;
-			destroyBoxes();
-		}
-
-		clearSec = new Button();
-		clearSec.text = "Clear Section";
-		clearSec.onClick = function(e)
-		{
-			clearSection();
-		}
-
-		swapSec = new Button();
-		swapSec.text = "Swap Section";
-		swapSec.onClick = function(e)
-		{
-			var secit = SONG.notes[curSection];
-
-			if (secit != null)
-			{
-				var secit = SONG.notes[curSection];
-
-				if (secit != null)
-				{
-					swapSection(secit);
-				}
-			}
-		}
-
-		duet = new Button();
-		duet.text = "Duet Notes";
-		duet.onClick = function(e)
-		{
-			var duetNotes:Array<ChartNote> = [];
-			for (note in SONG.notes[curSection].sectionNotes)
-			{
-				var boob = note.data;
-				if (boob > 3)
-					boob -= 4;
-				else
-					boob += 4;
-
-				var copiedNote:ChartNote = {
-					time: note.time,
-					data: boob,
-					length: note.length,
-					type: note.type
-				};
-				duetNotes.push(copiedNote);
-			}
-
-			for (i in duetNotes)
-			{
-				SONG.notes[curSection].sectionNotes.push(i);
-			}
-		}
-
-		mirror = new Button();
-		mirror.text = "Mirror Notes";
-		mirror.onClick = function(e)
-		{
-			var mirrored:Array<ChartNote> = [];
-			for (note in SONG.notes[curSection].sectionNotes)
-			{
-				var boob = note.data % 4;
-				boob = 3 - boob;
-				if (note.data > 3)
-					boob += 4;
-
-				var copiedNote:ChartNote = {
-					time: note.time,
-					data: boob,
-					length: note.length,
-					type: note.type
-				};
-				mirrored.push(copiedNote);
-			}
-
-			for (i in mirrored)
-			{
-				SONG.notes[curSection].sectionNotes.push(i);
-			}
-
-			destroyBoxes();
-		}
-
-		var sectionToCopy:Int = 0;
-
-		copySec = new Button();
-		copySec.text = "Copy Section";
-		copySec.onClick = function(e)
-		{
-			copiedNotes = [];
-			sectionToCopy = curSection;
-			var secit = SONG.notes[curSection];
-			for (i in 0...secit.sectionNotes.length)
-			{
-				var note:ChartNote = secit.sectionNotes[i];
-				copiedNotes.push(note);
-			}
-		}
-
-		pasteSec = new Button();
-		pasteSec.text = "Paste Section";
-		pasteSec.onClick = function(e)
-		{
-			destroyBoxes();
-
-			if (copiedNotes == null || copiedNotes.length < 1)
-			{
-				return;
-			}
-
-			var addToTime:Float = Conductor.stepCrochet * (16 * (curSection - sectionToCopy));
-			// trace('Time to add: ' + addToTime);
-			for (note in copiedNotes)
-			{
-				var newStrumTime:Float = note.time + addToTime;
-				var copiedNote:ChartNote = {
-					time: newStrumTime,
-					data: note.data,
-					length: note.length,
-					type: note.type
-				};
-				SONG.notes[curSection].sectionNotes.push(copiedNote);
-			}
-		}
-
-		clearCopiedNotes = new Button();
-		clearCopiedNotes.text = "Clear Copied Notes";
-		clearCopiedNotes.onClick = function(e)
-		{
-			copiedNotes = [];
-		}
-
-		secBox.addComponent(playerSection); // really weird methods
-		secBox.addComponent(refreshSec);
-		secBox.addComponent(clearSec);
-		secBox.addComponent(copySec);
-		secBox.addComponent(pasteSec);
-		secBox.addComponent(clearCopiedNotes);
-		secBox.addComponent(swapSec);
-		secBox.addComponent(mirror);
-		secBox.addComponent(duet);
-
-		secGrid.addComponent(secBox);
-
-		box3.addComponent(secGrid);
-	}
-
-	function addSongUI()
-	{
-		vbox1 = new VBox();
-		vbox3 = new VBox();
-		uiGrid = new Grid();
-		var grid2 = new Grid();
-
-		song = new TextField();
-		song.text = SONG.songId;
-		song.width = 100;
-
-		var songId = new Label();
-		songId.text = "Song ID";
-		songId.verticalAlign = "center";
-
-		songName = new TextField();
-		songName.text = SONG.songName;
-		songName.width = 100;
-
-		var displayName = new Label();
-		displayName.text = "Display Name";
-		displayName.verticalAlign = "center";
-
-		audioFileName = new TextField();
-		audioFileName.text = SONG.audioFile;
-		audioFileName.width = 100;
-
-		var audioFile = new Label();
-		audioFile.text = "Audio File";
-		audioFile.verticalAlign = "center";
-
-		hasVoices = new CheckBox();
-		hasVoices.selected = SONG.needsVoices;
-		hasVoices.text = "Use Vocals";
-		hasVoices.onClick = function(e)
-		{
-			SONG.needsVoices = !SONG.needsVoices;
-		}
-
-		isSplit = new CheckBox();
-		isSplit.text = "Split Vocals";
-		isSplit.selected = SONG.splitVoiceTracks;
-		isSplit.onClick = function(e)
-		{
-			SONG.splitVoiceTracks = !SONG.splitVoiceTracks;
-		}
-
-		bpm = new NumberStepper();
-		bpm.max = 666; // this is a reference that you will likely not understand FNVX
-		bpm.min = 1;
-		bpm.precision = 3;
-		bpm.step = 0.1;
-		bpm.pos = SONG.bpm;
-		bpm.decimalSeparator = ".";
-		bpm.onChange = function(e)
-		{
-			if (SONG.bpm != bpm.pos)
-			{
-				SONG.bpm = bpm.pos;
-				SONG.eventObjects[0].args[0] = bpm.pos;
-				recalculateAllSectionTimes();
-				calculateMaxBeat();
-				checkforSections();
-				regenerateLines();
-				if (SONG.eventObjects[0].type != "BPM Change")
-					lime.app.Application.current.window.alert("i'm crying, first event isn't a bpm change. fuck you");
-				else
-					SONG.eventObjects[0].args[0] = bpm.pos;
-			}
-		}
-
-		var bpmLabel = new Label();
-		bpmLabel.text = "BPM";
-		bpmLabel.verticalAlign = "center";
-
-		scrollSpeed = new NumberStepper();
-		scrollSpeed.max = 10;
-		scrollSpeed.min = 0.1;
-		scrollSpeed.precision = 3;
-		scrollSpeed.step = 0.05;
-		scrollSpeed.pos = SONG.speed;
-		scrollSpeed.decimalSeparator = ".";
-		scrollSpeed.onChange = function(e)
-		{
-			SONG.speed = scrollSpeed.pos;
-		}
-
-		var ssLabel = new Label();
-		ssLabel.text = "Scroll Speed";
-		ssLabel.verticalAlign = "center";
-
-		instVol = new NumberStepper();
-		instVol.max = 1;
-		instVol.min = 0;
-		instVol.precision = 2;
-		instVol.step = 0.1;
-		instVol.pos = inst.volume;
-		instVol.decimalSeparator = ".";
-		instVol.onChange = function(e)
-		{
-			inst.volume = instVol.pos;
-		}
-
-		var iVolLabel = new Label();
-		iVolLabel.text = "Inst Volume";
-		iVolLabel.verticalAlign = "center";
-
-		vocalVol = new NumberStepper();
-		vocalVol.max = 1;
-		vocalVol.min = 0;
-		vocalVol.precision = 2;
-		vocalVol.step = 0.1;
-		if (vocals != null)
-			vocalVol.pos = vocals.volume;
-
-		vocalVol.decimalSeparator = ".";
-		vocalVol.onChange = function(e)
-		{
-			if (vocals != null)
-				vocals.volume = vocalVol.pos;
-		}
-
-		var vVolLabel = new Label();
-		vVolLabel.text = "Vocals Volume";
-		vVolLabel.verticalAlign = "center";
-
-		vocalPVol = new NumberStepper();
-		vocalPVol.max = 1;
-		vocalPVol.min = 0;
-		vocalPVol.precision = 2;
-		vocalPVol.step = 0.1;
-		if (vocalsP != null)
-			vocalPVol.pos = vocalsP.volume;
-
-		vocalPVol.decimalSeparator = ".";
-		vocalPVol.onChange = function(e)
-		{
-			if (vocalsP != null)
-				vocalsP.volume = vocalPVol.pos;
-		}
-
-		var vpVolLabel = new Label();
-		vpVolLabel.text = "Vocals (Player) Volume";
-		vpVolLabel.verticalAlign = "center";
-
-		vocalEVol = new NumberStepper();
-		vocalEVol.max = 1;
-		vocalEVol.min = 0;
-		vocalEVol.precision = 2;
-		vocalEVol.step = 0.1;
-		if (vocalsE != null)
-			vocalEVol.pos = vocalsE.volume;
-		vocalEVol.decimalSeparator = ".";
-		vocalEVol.onChange = function(e)
-		{
-			if (vocalsE != null)
-				vocalsE.volume = vocalEVol.pos;
-		}
-		var difficulties:Array<String> = CoolUtil.difficulties;
-		diffDrop = new DropDown();
-		diffDrop.width = 95;
-		diffDrop.onChange = function(e)
-		{
-			if (!diffDrop.dropDownOpen)
-			{
-				if (curDiff != difficulties[diffDrop.selectedIndex])
-				{
-					curDiff = difficulties[diffDrop.selectedIndex];
-					loadJson(SONG.songId.toLowerCase(), curDiff);
-				}
-				Debug.logTrace("Selected Difficulty : " + curDiff);
-			}
-		}
-		var diffList = new ArrayDataSource<Dynamic>();
-		for (diff in 0...difficulties.length)
-		{
-			diffList.add(difficulties[diff]);
-		}
-		diffDrop.dataSource = diffList;
-		diffDrop.selectItemBy(item -> item == curDiff, true);
-
-		var veVolLabel = new Label();
-		veVolLabel.text = "Vocals (Enemy) Volume";
-		veVolLabel.verticalAlign = "center";
-
-		uiGrid.addComponent(song);
-		uiGrid.addComponent(songId);
-
-		uiGrid.addComponent(songName);
-		uiGrid.addComponent(displayName);
-
-		uiGrid.addComponent(audioFileName);
-		uiGrid.addComponent(audioFile);
-
-		grid2.addComponent(bpm);
-		grid2.addComponent(bpmLabel);
-
-		grid2.addComponent(scrollSpeed);
-		grid2.addComponent(ssLabel);
-
-		grid2.addComponent(instVol);
-		grid2.addComponent(iVolLabel);
-
-		grid2.addComponent(vocalVol);
-		grid2.addComponent(vVolLabel);
-
-		grid2.addComponent(vocalPVol);
-		grid2.addComponent(vpVolLabel);
-
-		grid2.addComponent(vocalEVol);
-		grid2.addComponent(veVolLabel);
-
-		vbox1.addComponent(uiGrid);
-		vbox1.addComponent(grid2);
-
-		vbox3.addComponent(hasVoices);
-		vbox3.addComponent(isSplit);
-		vbox3.addComponent(diffDrop);
-
-		box4.addComponent(vbox1);
-		box4.addComponent(vbox3);
-	}
-
-	function addEventUI()
-	{
-		var vbox:VBox = new VBox();
-		var vbox2 = new VBox();
-		var grid = new Grid();
-
-		var eventList:Array<Event> = []; // existing events
-		var eventIndex:Int = 0;
-		var existingEvents = new ArrayDataSource<Dynamic>();
-		for (event in 0...SONG.eventObjects.length)
-		{
-			existingEvents.add(SONG.eventObjects[event].name);
-			eventList.push(SONG.eventObjects[event]);
-		}
-
-		var eventTypeList = new ArrayDataSource<Dynamic>();
-		for (event in 0...events.length)
-		{
-			eventTypeList.add(events[event]);
-		}
-
-		var existingLabel = new Label();
-		existingLabel.text = "Existing Events";
-
-		var eventListLabel = new Label();
-		eventListLabel.text = "Event Types";
-
-		var eventNameLabel = new Label();
-		eventNameLabel.text = "Current Event Name";
-
-		var value1Label = new Label();
-		value1Label.text = "Event Value 1";
-
-		var value2Label = new Label();
-		value2Label.text = "Event Value 2";
-
-		var posLabel = new Label();
-		posLabel.text = "Event Position";
-
-		// existing events
-		eventDrop = new DropDown();
-		eventDrop.width = 125;
-
-		eventDrop.selectedIndex = 0;
-		eventDrop.dataSource = existingEvents;
-		eventDrop.registerEvent(UIEvent.CLOSE, function(e:UIEvent)
-		{
-			eventIndex = eventDrop.selectedIndex;
-			var event = containsName(eventList[eventIndex].name, SONG.eventObjects);
-			if (event == null)
-				return;
-
-			savedValue = event.args[0];
-			savedValue2 = event.args[1];
-			savedType = event.type;
-			currentSelectedEventName = event.name;
-			eventName.text = currentSelectedEventName;
-			eventVal1.text = event.args[0] + "";
-			eventVal2.text = event.args[1] + "";
-			currentEventPosition = event.beat;
-			eventPosition.text = Std.string(currentEventPosition);
-			eventVal2.text = event.args[1] + "";
-			Debug.logTrace('$currentSelectedEventName $savedType $savedValue $savedValue2 $currentEventPosition');
-			eventTypes.selectItemBy(item -> item == savedType, true);
-		});
-		eventIndex = eventDrop.selectedIndex;
-
-		eventTypes = new DropDown();
-		eventTypes.width = 125;
-		eventTypes.dataSource = eventTypeList;
-		eventTypes.selectedIndex = 0;
-		eventTypes.onChange = function(e)
-		{
-			savedType = events[eventTypes.selectedIndex];
-		}
-
-		eventAdd = new Button();
-		eventAdd.text = "Add Event";
-		eventAdd.onClick = function(e)
-		{
-			var pog:Event = {
-				name: "New Event " + HelperFunctions.truncateFloat(curDecimalBeat, 2),
-				beat: HelperFunctions.truncateFloat(curDecimalBeat, 3),
-				args: [SONG.bpm, 1],
-				type: "BPM Change"
-			};
-
-			var obj = containsName(pog.name, SONG.eventObjects);
-
-			if (obj != null)
-				return;
-
-			SONG.eventObjects.push(pog);
-
-			existingEvents.clear();
-			eventList = [];
-			for (event in 0...SONG.eventObjects.length)
-			{
-				existingEvents.add(SONG.eventObjects[event].name);
-				eventList.push(SONG.eventObjects[event]);
-			}
-
-			eventName.text = pog.name;
-			eventVal1.text = pog.args[0] + "";
-			eventVal2.text = pog.args[1] + "";
-			eventPosition.text = pog.beat + "";
-			currentSelectedEventName = pog.name;
-			currentEventPosition = pog.beat;
-			savedValue = pog.args[0];
-			savedValue2 = pog.args[1];
-			savedType = pog.type;
-
-			eventDrop.dataSource = existingEvents;
-			eventDrop.selectItemBy(item -> item == currentSelectedEventName, true);
-			eventTypes.selectItemBy(item -> item == savedType, true);
-			regenerateLines();
-		}
-
-		eventName = new TextField();
-		eventName.text = SONG.eventObjects[0].name;
-		eventName.onChange = function(e)
-		{
-			// currentSelectedEventName = eventName.text;
-			var obj = containsName(currentSelectedEventName, SONG.eventObjects);
-			if (obj == null)
-			{
-				currentSelectedEventName = eventName.text;
-				return;
-			}
-			obj = containsName(eventName.text, SONG.eventObjects);
-			if (obj != null)
-				return;
-			obj = containsName(currentSelectedEventName, SONG.eventObjects);
-			obj.name = eventName.text;
-			currentSelectedEventName = eventName.text;
-		}
-
-		eventSave = new Button();
-		eventSave.text = "Save Event";
-		eventSave.onClick = function(e)
-		{
-			var pog:Event = {
-				name: currentSelectedEventName,
-				beat: currentEventPosition,
-				args: [savedValue, savedValue2],
-				type: savedType
-			};
-
-			var obj = containsName(pog.name, SONG.eventObjects);
-
-			if (pog.name == "")
-				return;
-
-			if (obj != null)
-				SONG.eventObjects.remove(obj);
-
-			SONG.eventObjects.push(pog);
-			SONG.eventObjects.sort(function(a, b)
-			{
-				if (a.beat < b.beat)
-					return -1
-				else if (a.beat > b.beat)
-					return 1;
-				else
-					return 0;
-			});
-
-			existingEvents.clear();
-			eventList.resize(0);
-			for (event in 0...SONG.eventObjects.length)
-			{
-				existingEvents.add(SONG.eventObjects[event].name);
-				eventList.push(SONG.eventObjects[event]);
-			}
-			eventDrop.dataSource = existingEvents;
-			eventIndex = eventList.length - 1;
-			eventDrop.selectItemBy(item -> item == pog.name, true);
-			regenerateLines();
-
-			Debug.logTrace('$currentSelectedEventName $currentEventPosition $savedType');
-		}
-
-		eventRemove = new Button();
-		eventRemove.text = "Remove Event";
-		eventRemove.onClick = function(e)
-		{
-			var obj = containsName(currentSelectedEventName, SONG.eventObjects);
-
-			if (obj == null)
-				return;
-
-			SONG.eventObjects.remove(obj);
-
-			var firstEvent = SONG.eventObjects[0];
-
-			if (firstEvent == null)
-			{
-				SONG.eventObjects.push({
-					name: "Init BPM",
-					beat: 0,
-					args: [SONG.bpm, 1],
-					type: "BPM Change"
-				});
-				firstEvent = SONG.eventObjects[0];
-			}
-
-			existingEvents.clear();
-			eventList = [];
-			for (event in 0...SONG.eventObjects.length)
-			{
-				existingEvents.add(SONG.eventObjects[event].name);
-				eventList.push(SONG.eventObjects[event]);
-			}
-
-			eventIndex = eventList.length - 1;
-			eventDrop.dataSource = existingEvents;
-
-			eventName.text = firstEvent.name;
-			eventVal1.text = firstEvent.args[0] + "";
-			eventVal2.text = firstEvent.args[1] + "";
-			eventPosition.text = firstEvent.beat + "";
-			currentSelectedEventName = firstEvent.name;
-			currentEventPosition = firstEvent.beat;
-			eventDrop.selectItemBy(item -> item == firstEvent.name, true);
-			regenerateLines();
-		}
-
-		eventPos = new Button();
-		eventPos.text = "Update Position";
-		eventPos.onClick = function(e)
-		{
-			var obj = containsName(currentSelectedEventName, SONG.eventObjects);
-			if (obj == null)
-				return;
-			currentEventPosition = HelperFunctions.truncateFloat(curDecimalBeat, 3);
-			obj.beat = currentEventPosition;
-			eventPosition.text = currentEventPosition + "";
-		}
-
-		eventPosition = new TextField();
-		eventPosition.text = Std.string(SONG.eventObjects[0].beat);
-		eventPosition.onChange = function(e)
-		{
-			var obj = containsName(currentSelectedEventName, SONG.eventObjects);
-			if (obj == null)
-				return;
-			currentEventPosition = Std.parseFloat(eventPosition.text);
-			obj.beat = currentEventPosition;
-		}
-
-		eventVal1 = new TextField();
-		eventVal1.text = SONG.eventObjects[0].args[0];
-		eventVal1.onChange = function(e)
-		{
-			savedValue = eventVal1.text;
-		}
-
-		eventVal2 = new TextField();
-		eventVal2.text = SONG.eventObjects[0].args[1];
-		eventVal2.onChange = function(e)
-		{
-			savedValue2 = eventVal2.text;
-		}
-
-		vbox.addComponent(existingLabel);
-		vbox.addComponent(eventDrop);
-		vbox.addComponent(eventListLabel);
-		vbox.addComponent(eventTypes);
-		vbox.addComponent(eventNameLabel);
-		vbox.addComponent(eventName);
-		vbox.addComponent(value1Label);
-		vbox.addComponent(eventVal1);
-		vbox.addComponent(value2Label);
-		vbox.addComponent(eventVal2);
-		vbox.addComponent(posLabel);
-		vbox.addComponent(eventPosition);
-		vbox2.addComponent(eventAdd);
-		vbox2.addComponent(eventSave);
-		vbox2.addComponent(eventRemove);
-		vbox2.addComponent(eventPos);
-		grid.addComponent(vbox);
-		grid.addComponent(vbox2);
-		box5.addComponent(grid);
-
-		// dfjk
-	}
-
-	function addTabs()
-	{
-		box = new ContinuousHBox();
-		box.padding = 5;
-		box.width = 300;
-		box.text = "Assets";
-
-		box2 = new ContinuousHBox();
-		box2.width = 300;
-		box2.padding = 5;
-		box2.text = "Note";
-
-		box3 = new ContinuousHBox();
-		box3.width = 300;
-		box3.padding = 5;
-		box3.text = "Section";
-
-		box4 = new HBox();
-		box4.width = 300;
-		box4.padding = 5;
-		box4.text = "Song";
-		// box4.color = daColor;
-
-		box5 = new ContinuousHBox();
-		box5.width = 300;
-		box5.padding = 5;
-		box5.text = "Events";
-		// box5.color = daColor;
-		// ignore
-
-		ui.addComponent(box);
-		ui.addComponent(box2);
-		ui.addComponent(box3);
-		ui.addComponent(box4);
-		ui.addComponent(box5);
-	}
-
-	function menuBarShit()
-	{
-		var spac = new Spacer();
-		spac.width = 210;
-		var file = new Menu();
-		file.text = "Chart";
-		var personal = new Menu();
-		personal.text = "Preferences";
-		var game = new Menu();
-		game.text = "Game";
-
-		var box = new VBox();
-
-		var saveSong = new MenuItem();
-		saveSong.text = "Save Chart";
-		saveSong.onClick = function(e)
-		{
-			saveLevel();
-		}
-
-		var loadAuto = new MenuItem();
-		loadAuto.text = "Load Autosave";
-		loadAuto.onClick = function(e)
-		{
-			loadAutosave();
-		}
-
-		var reload = new MenuItem();
-		reload.text = "Reload Audio";
-		reload.onClick = function(e)
-		{
-			try
-			{
-				if (inst.playing)
-				{
-					inst.stop();
-					if (!SONG.splitVoiceTracks)
-						vocals.stop();
-					else
-					{
-						vocalsP.stop();
-						vocalsE.stop();
-					}
-				}
-				loadSong(SONG.audioFile.toLowerCase(), false);
-			}
-			catch (e)
-				Debug.logTrace(e);
-			// goofy song overlapping and raping your ears
-		}
-
-		var reloadChart = new MenuItem();
-		reloadChart.text = "Reload Chart";
-		reloadChart.onClick = function(e)
-		{
-			var clean = false;
-			loadJson(SONG.songId.toLowerCase(), curDiff);
-		}
-
-		var cleanSong = new MenuItem();
-		cleanSong.text = "Clear Chart";
-		cleanSong.onClick = function(e)
-		{
-			NotificationManager.instance.addNotification({
-				title: "Are You Sure You Want To Clear The Chart?",
-				body: "All Notes Will Be Cleared.",
-				type: NotificationType.Error,
-				actions: [
-					{
-						text: "Clear",
-						callback: (data) ->
-						{
-							for (daSection in SONG.notes)
-							{
-								for (i in 0...daSection.sectionNotes.length)
-									daSection.sectionNotes = [];
-							}
-							NotificationManager.instance.addNotification({
-								title: "Chart Cleared.",
-								body: "All Notes Cleared.",
-								type: NotificationType.Success,
-							});
-							return true;
-						}
-					},
-					{
-						text: "Nevermind",
-						callback: (data) ->
-						{
-							return true;
-						}
-					}
-				]
-			});
-		}
-
-		/*
-			var create = new MenuItem();
-			create.text = "Create Blank Chart";
-			create.onClick = function(e)
-			{
-				var cleaned = {
-					songId: 'test',
-					songName: 'Test',
-					audioFile: 'test',
-					chartVersion: "KEC1",
-					splitVoiceTracks: true,
-					notes: [],
-					bpm: 150,
-					needsVoices: true,
-					player1: 'bf',
-					player2: 'dad',
-					gfVersion: 'gf',
-					style: 'Default',
-					stage: 'stage',
-					speed: 1,
-					validScore: true,
-					eventObjects: [
-						{
-							name: "Init BPM",
-							beat: 0,
-							args: [150],
-							type: "BPM Change"
-						}
-					]
-				};
-
-				var cleanedData = Json.parse(haxe.Json.stringify({
-					"song": cleaned
-				}));
-
-				var data:Modern = cast cleanedData;
-				var meta:SongMeta = {};
-				if (cleanedData.song != null)
-				{
-					meta = cleanedData.songMeta != null ? cast cleanedData.songMeta : {};
-				}
-				PlayState.SONG = Song.parseJSONshit(data.songId, data, meta);
-				clean = true;
-				MusicBeatState.switchState(new ChartingState());
-			}
-			broken for now, smth smth events smh
-		 */
-
-		file.addComponent(saveSong);
-		file.addComponent(reloadChart);
-		file.addComponent(reload);
-		file.addComponent(loadAuto);
-		file.addComponent(cleanSong);
-		// file.addComponent(create);
-
-		var dragTabs = new MenuCheckBox();
-		dragTabs.text = "Drag Tablist";
-		dragTabs.selected = FlxG.save.data.moveEditor;
-		dragTabs.onClick = function(e)
-		{
-			FlxG.save.data.moveEditor = !FlxG.save.data.moveEditor;
-			ui.draggable = FlxG.save.data.moveEditor;
-			dragTabs.selected = FlxG.save.data.moveEditor;
-		}
-
-		metronome = new MenuCheckBox();
-		metronome.text = "Metronome";
-		metronome.selected = FlxG.save.data.chart_metronome;
-		metronome.onClick = function(e)
-		{
-			FlxG.save.data.chart_metronome = !FlxG.save.data.chart_metronome;
-			metronome.selected = FlxG.save.data.chart_metronome;
-		}
-		var hsv = new Label();
-		hsv.text = "Hitsound Volume";
-		hsv.horizontalAlign = "center";
-
-		hitsoundsVol = new HorizontalSlider();
-		hitsoundsVol.max = 1;
-		hitsoundsVol.min = 0;
-		hitsoundsVol.precision = 2;
-		hitsoundsVol.step = 0.05;
-		hitsoundsVol.minorTicks = 0.05;
-		hitsoundsVol.majorTicks = 0.25;
-		hitsoundsVol.pos = 0.5; // pissed me off so badly
-
-		hitsoundsP = new MenuCheckBox();
-		hitsoundsP.text = "Hitsounds (Player)";
-		hitsoundsP.selected = FlxG.save.data.playHitsounds;
-		hitsoundsP.onClick = function(e)
-		{
-			FlxG.save.data.playHitsounds = !FlxG.save.data.playHitsounds;
-			hitsoundsP.selected = FlxG.save.data.playHitsounds;
-		}
-
-		hitsoundsE = new MenuCheckBox();
-		hitsoundsE.text = "Hitsounds (Opponent)";
-
-		hitsoundsE.selected = FlxG.save.data.playHitsoundsE;
-		hitsoundsE.onClick = function(e)
-		{
-			FlxG.save.data.playHitsoundsE = !FlxG.save.data.playHitsoundsE;
-			hitsoundsE.selected = FlxG.save.data.playHitsoundsE;
-		}
-
-		oppMode = new MenuCheckBox();
-		oppMode.text = "Opponent Mode";
-		oppMode.selected = FlxG.save.data.opponent;
-		oppMode.onClick = function(e)
-		{
-			FlxG.save.data.opponent = !FlxG.save.data.opponent;
-		}
-
-		var savePos = new MenuItem();
-		savePos.text = "Save Tablist Position";
-		savePos.onClick = function(e)
-		{
-			FlxG.save.data.editorPos = [ui.x, ui.y];
-		}
-
-		var resetPos = new MenuItem();
-		resetPos.text = "Reset Tablist Position";
-		resetPos.onClick = function(e)
-		{
-			FlxG.save.data.editorPos = [0, 420];
-			ui.x = 0;
-			ui.y = 420;
-		}
-
-		personal.addComponent(dragTabs);
-		personal.addComponent(resetPos);
-		box.addComponent(hsv);
-		personal.addComponent(box);
-		personal.addComponent(hitsoundsVol);
-		personal.addComponent(hitsoundsP);
-		personal.addComponent(hitsoundsE);
-		personal.addComponent(metronome);
-		personal.addComponent(oppMode);
-
-		var playHere = new MenuItem();
-		playHere.text = "Playtest At Timestamp";
-		playHere.onClick = function(e)
-		{
-			PlayState.SONG = SONG;
-
-			PlayState.startTime = inst.time;
-			inst.stop();
-			if (!SONG.splitVoiceTracks)
-				vocals.stop();
-			else
-			{
-				vocalsP.stop();
-				vocalsE.stop();
-			}
-			MusicBeatState.switchState(new PlayState());
-			Lib.clearInterval(id);
-		}
-		game.addComponent(playHere);
-
-		menu.addComponent(spac);
-		menu.addComponent(file);
-		menu.addComponent(personal);
-		menu.addComponent(game);
-	}
-
-	override function sectionHit()
-	{
-		super.sectionHit();
-		if (curSection < 0)
-			return;
-
-		noteGroup.forEachAlive(function(n:EditorNote)
-		{
-			n.kill();
-		});
-
-		sustainGroup.forEachAlive(function(n:EditorSustain)
-		{
-			n.kill();
-		});
-		noteCounter = 0;
-	}
-
-	override function beatHit()
-	{
-		super.beatHit();
-
-		if (FlxG.save.data.chart_metronome)
-			FlxG.sound.play(Paths.sound('Metronome_Tick'));
-	}
+		if (FlxG.save.data.chart_metronome)
+			FlxG.sound.play(Paths.sound('Metronome_Tick'));
+	}
 
 	override function stepHit()
 	{
@@ -2514,7 +1059,6 @@ class ChartingState extends MusicBeatState
 	inline function mouseValid():Bool
 	{
 		// NOTE: we're checking the mouse's y so notes/events can't be placed outside of the grid
-
 		return mouse.x >= grid.x - separatorWidth && mouse.x < grid.x + grid.width && FlxG.mouse.y >= 0 && FlxG.mouse.y < end;
 	}
 
@@ -2538,13 +1082,18 @@ class ChartingState extends MusicBeatState
 
 	private function checkNoteSpawn()
 	{
-		var strumTime = getTimeFromY(mouse.y);
-		var noteData:Int = Math.floor((mouse.x - grid.x) / gridSize);
-		var existingNote:EditorNote = noteGroup.getFirst((n) -> n.alive && n.rawData == noteData && FlxG.mouse.overlaps(n));
-		if (existingNote == null)
-			addNote();
+		final strumTime = getTimeFromY(mouse.y);
+		final noteData:Int = Math.floor((mouse.x - grid.x) / gridSize);
+		var existingNote = noteGroup.members.filter(function(n:EditorNote)
+		{
+			final real = (n.time == strumTime && n.rawData == noteData && n.alive);
+			return real;
+		});
+
+		if (existingNote[0] != null)
+			deleteNote(existingNote[0]);
 		else
-			deleteNote(existingNote);
+			addNote();
 	}
 
 	private inline function createGrid()
@@ -2566,8 +1115,8 @@ class ChartingState extends MusicBeatState
 		strumLine.x += separatorWidth;
 		strumLine.active = false;
 
-		FlxG.camera.follow(strumLine, LOCKON);
-		FlxG.camera.targetOffset.y = 100;
+		noteCam.follow(strumLine, LOCKON);
+		noteCam.targetOffset.y = 100;
 		add(mouse);
 		add(strumLine);
 	}
@@ -2711,4 +1260,69 @@ class ChartingState extends MusicBeatState
 		};
 		return sec;
 	}
+
+	public inline function sortNotes(sec:Section):Void
+		sec.sectionNotes.sort((a, b) -> Std.int(a.time - b.time));
+
+	private function initHUI()
+	{
+		final characterList:Array<String> = CoolUtil.coolTextFile(Paths.txt('data/characterList'));
+		final gfList:Array<String> = CoolUtil.coolTextFile(Paths.txt('data/gfVersionList'));
+		final stageList:Array<String> = CoolUtil.coolTextFile(Paths.txt('data/stageList'));
+		final styleList:Array<String> = CoolUtil.coolTextFile(Paths.txt('data/songStyleList'));
+		final diffList:Array<String> = CoolUtil.difficulties;
+		var chars = new ArrayDataSource<String>();
+		for (c in characterList)
+			chars.add(c);
+
+		var gfs = new ArrayDataSource<String>();
+		for (c in gfList)
+			gfs.add(c);
+
+		var stages = new ArrayDataSource<String>();
+		for (s in stageList)
+			stages.add(s);
+
+		var styles = new ArrayDataSource<String>();
+		for (s in styleList)
+			styles.add(s);
+		var diffs = new ArrayDataSource<String>();
+		for (d in diffList)
+			diffs.add(d);
+
+		playerSelect.dataSource = chars;
+		opponentSelect.dataSource = chars;
+		gfSelect.dataSource = gfs;
+		stageSelect.dataSource = stages;
+		styleSelect.dataSource = styles;
+		diffSelect.dataSource = diffs;
+
+		setHUIData();
+		editorAutoSave.selected = FlxG.save.data.autoSaving;
+		editorAutoSave.onClick = _ -> FlxG.save.data.autoSaving = !FlxG.save.data.autoSaving;
+
+		chartSave.onClick = _ -> saveChart();
+		chartReload.onClick = _ -> loadAudio(dataID.text, true);
+		diffSelect.onChange = function(e)
+		{
+			PlayState.storyDifficulty = CoolUtil.difficulties.indexOf(diffSelect.text);
+			Debug.logTrace(CoolUtil.difficulties[PlayState.storyDifficulty]);
+		}
+	}
+
+	private function setHUIData()
+	{
+		playerSelect.selectItemBy(item -> item == SONG.player1, true);
+		opponentSelect.selectItemBy(item -> item == SONG.player2, true);
+		gfSelect.selectItemBy(item -> item == SONG.gfVersion, true);
+		stageSelect.selectItemBy(item -> item == SONG.stage, true);
+		styleSelect.selectItemBy(item -> item == SONG.style, true);
+		diffSelect.selectItemBy(item -> item == CoolUtil.difficulties[PlayState.storyDifficulty], true);
+		dataID.text = SONG.songId;
+		dataName.text = SONG.songName;
+		dataAudio.text = SONG.audioFile;
+		dataBPM.pos = SONG.eventObjects[0].args[0];
+		dataSpeed.pos = SONG.speed;
+		sectionMustHit.onClick = _ -> currentSection.mustHitSection = !currentSection.mustHitSection;
+	}
 }
diff --git a/source/kec/substates/OptionsMenu.hx b/source/kec/substates/OptionsMenu.hx
index 5f50bc3d..21865c6c 100644
--- a/source/kec/substates/OptionsMenu.hx
+++ b/source/kec/substates/OptionsMenu.hx
@@ -195,6 +195,7 @@ class OptionsMenu extends MusicBeatSubstate
 			]),
 			new OptionCata(640, 40, "Misc", [
 				new FlashingLightsOption("Toggle flashing lights that can cause epileptic seizures and strain."),
+				new ColorBlindOption("What Color Filter Will The Game Use For Color Blind Users."),
 				new AutoPauseOption("Makes The Game Stop Updating/Running When Tabbed Out Of The Game."),
 				new WatermarkOption("Enable and disable all watermarks from the engine."),
 				new MissSoundsOption("Toggle miss sounds playing when you don't hit a note."),
diff --git a/source/kec/substates/ResultsScreen.hx b/source/kec/substates/ResultsScreen.hx
index 63fa8020..3802cd17 100644
--- a/source/kec/substates/ResultsScreen.hx
+++ b/source/kec/substates/ResultsScreen.hx
@@ -121,12 +121,9 @@ class ResultsScreen extends MusicBeatSubstate
 	override function create()
 	{
 		add(background);
-		if (!PlayState.inResults)
-		{
-			music.volume = 0;
-			music.play(false, FlxG.random.int(0, Std.int(music.length / 2)));
-			FlxG.sound.list.add(music);
-		}
+		music.volume = 0;
+		music.play(false, FlxG.random.int(0, Std.int(music.length / 2)));
+		FlxG.sound.list.add(music);
 
 		add(activeMods);