diff --git a/buildnumber.txt b/buildnumber.txt
index f534e5c3..ca573457 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-2656
\ No newline at end of file
+2664
\ No newline at end of file
diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx
index 3cbbdbea..801408e1 100644
--- a/source/funkin/editors/charter/Charter.hx
+++ b/source/funkin/editors/charter/Charter.hx
@@ -1,5 +1,6 @@
 package funkin.editors.charter;
 
+import flixel.util.FlxSort;
 import flixel.math.FlxPoint;
 import funkin.editors.charter.CharterBackdrop.CharterBackdropDummy;
 import funkin.system.Conductor;
@@ -51,6 +52,9 @@ class Charter extends UIState {
 
     public var selection:Array<CharterNote> = [];
 
+	public var undoList:Array<CharterChange> = [];
+	public var redoList:Array<CharterChange> = [];
+
     public function new(song:String, diff:String) {
         super();
         __song = song;
@@ -78,10 +82,12 @@ class Charter extends UIState {
                 label: "Edit",
                 childs: [
                     {
-                        label: "Undo"
+                        label: "Undo",
+						onSelect: _edit_undo
                     },
                     {
-                        label: "Redo"
+                        label: "Redo",
+						onSelect: _edit_redo
                     },
                     null,
                     {
@@ -258,6 +264,7 @@ class Charter extends UIState {
 					note.updatePos(FlxG.keys.pressed.SHIFT ? (mousePos.y / 40) : Std.int(mousePos.y / 40), Std.int(mousePos.x / 40), 0, 0);
 					notesGroup.add(note);
 					selection = [note];
+					addToUndo(CPlaceNote(note));
 				}
 			}
 			if (FlxG.mouse.justReleasedRight)
@@ -265,6 +272,88 @@ class Charter extends UIState {
 		}
 		selectionBox.visible = selectionBoxEnabled;
 	}
+
+    public function deleteNote(note:CharterNote):CharterNote {
+		if (note == null) return note;
+
+        notesGroup.remove(note, true);
+        note.kill();
+		addToUndo(CDeleteNotes([note]));
+        return null;
+    }
+
+	public function deleteNotes(notes:Array<CharterNote>) {
+		if (notes.length <= 0) return [];
+
+		for(note in notes) {
+			notesGroup.remove(note, true);
+			note.kill();
+		}
+		addToUndo(CDeleteNotes(notes));
+		return [];
+	}
+
+	// UNDO/REDO LOGIC
+	#if REGION
+	public inline function addToUndo(c:CharterChange) {
+		redoList = [];
+		undoList.insert(0, c);
+		while(undoList.length > Options.maxUndos)
+			undoList.pop();
+	}
+	
+	function _edit_undo() {
+		selection = [];
+		var v = undoList.shift();
+		switch(v) {
+			case null:
+				// do nothing
+			case CCreateNotes(notes):
+				for(n in notes) {
+					notesGroup.remove(n, true);
+					n.kill();
+				}
+			case CDeleteNotes(notes):
+				for(n in notes) {
+					notesGroup.add(n);
+					n.revive();
+				}
+				sortNotes();
+			case CPlaceNote(note):
+				notesGroup.remove(note, true);
+				note.kill();
+		}
+		if (v != null)
+			redoList.insert(0, v);
+	}
+
+	function _edit_redo() {
+		selection = [];
+		var v = redoList.shift();
+		switch(v) {
+			case null:
+				// do nothing
+			case CCreateNotes(notes):
+				for(n in notes) {
+					notesGroup.add(n);
+					n.revive();
+				}
+			case CDeleteNotes(notes):
+				for(n in notes) {
+					notesGroup.remove(n, true);
+					n.kill();
+				}
+			case CPlaceNote(note):
+				notesGroup.add(note);
+				note.revive();
+		}
+		if (v != null)
+			undoList.insert(0, v);
+	}
+	#end
+
+	public inline function sortNotes()
+		notesGroup.sort((i, c1, c2) -> FlxSort.byValues(i, c1.step, c2.step), FlxSort.ASCENDING);
 	#end
     public override function update(elapsed:Float) {
         // TODO: do optimization like NoteGroup
@@ -288,14 +377,14 @@ class Charter extends UIState {
 
             if (FlxG.keys.justPressed.DELETE)
                 _edit_delete();
-        }
-    }
 
-    public function deleteNote(note:CharterNote):CharterNote {
-        notesGroup.remove(note, true);
-        note.kill();
-        note.destroy();
-        return null;
+			if (FlxG.keys.pressed.CONTROL) {
+				if (FlxG.keys.justPressed.Z)
+					_edit_undo();
+				if (FlxG.keys.justPressed.Y)
+					_edit_redo();
+			}
+        }
     }
 
 
@@ -306,8 +395,13 @@ class Charter extends UIState {
     }
     function _edit_delete() {
         if (selection == null) return;
-        for(s in selection)
-            deleteNote(s);
+		selection = deleteNotes(selection);
     }
     #end
+}
+
+enum CharterChange {
+	CPlaceNote(note:CharterNote);
+	CCreateNotes(notes:Array<CharterNote>);
+	CDeleteNotes(notes:Array<CharterNote>);
 }
\ No newline at end of file
diff --git a/source/funkin/editors/charter/CharterNote.hx b/source/funkin/editors/charter/CharterNote.hx
index d0aaccef..8e87dbc8 100644
--- a/source/funkin/editors/charter/CharterNote.hx
+++ b/source/funkin/editors/charter/CharterNote.hx
@@ -50,6 +50,20 @@ class CharterNote extends UISprite {
         }});
     }
 
+	public override function kill() {
+		if (angleTween != null) {
+			angleTween.cancel();
+			angle = switch(animation.curAnim.curFrame = (id % 4)) {
+				case 0: -90;
+				case 1: 180;
+				case 2: 0;
+				case 3: 90;
+				default: 0; // how is that even possible
+			};
+		}
+		super.kill();
+	}
+
     public override function update(elapsed:Float) {
         super.update(elapsed);
         colorTransform.redMultiplier = colorTransform.greenMultiplier = colorTransform.blueMultiplier = selected ? 0.75 : 1;
diff --git a/source/funkin/options/Options.hx b/source/funkin/options/Options.hx
index 1a14a7a1..30a11f55 100644
--- a/source/funkin/options/Options.hx
+++ b/source/funkin/options/Options.hx
@@ -37,6 +37,7 @@ class Options
 	 */
 	public static var editorSFX:Bool = true;
 	public static var resizableEditors:Bool = true;
+	public static var maxUndos:Int = 120;
 
 	/**
 	 * PLAYER 1 CONTROLS