diff --git a/CHANGELOG.md b/CHANGELOG.md
index 112ab5f21..80367d567 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Enemy icons change when they you are winning a lot ([Thanks to pahaze for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/138))
 - Holding CTRL in charting editor places notes on both sides
+- Q and E changes sustain lengths in note editor
 - Other charting editor workflow improvements
+### Removed
+- Removed APE
 ### Fixed
 - Song no longer loops when finishing the song. ([Thanks Injourn for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/132))
 
diff --git a/assets/data/cocoa/cocoa.json b/assets/data/cocoa/cocoa.json
new file mode 100644
index 000000000..daa060bd7
--- /dev/null
+++ b/assets/data/cocoa/cocoa.json
@@ -0,0 +1 @@
+{"song":{"song":"Cocoa","notes":[{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[0,0,0],[600,2,0],[900,0,0],[1350,1,0],[1650,3,0],[1950,1,0],[2100,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[3000,2,0],[3300,0,0],[3750,1,0],[4050,3,0],[4350,1,0],[4500,0,0],[2400,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[4800,0,0],[4950,3,0],[5100,0,0],[5250,3,0],[5400,2,0],[5700,0,0],[5850,3,0],[6000,0,0],[6150,3,0],[6300,2,0],[6600,0,0],[6750,3,0],[6900,0,0],[7050,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[7200,2,0],[7500,0,0],[7650,3,0],[7800,0,0],[7950,3,0],[8100,2,0],[8400,0,0],[8550,3,0],[8700,0,0],[8850,3,0],[9000,2,0],[9300,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[9600,0,0],[10200,2,0],[10500,0,0],[10950,1,0],[11250,3,0],[11550,1,0],[11700,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[12600,2,0],[12900,0,0],[13350,1,0],[13650,3,0],[13950,1,0],[14100,0,0],[12000,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[14400,0,0],[14550,3,0],[14700,0,0],[14850,3,0],[15000,2,0],[15300,0,0],[15450,3,0],[15600,0,0],[15750,3,0],[15900,2,0],[16200,0,0],[16350,3,0],[16500,0,0],[16650,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[16800,2,0],[17100,0,0],[17250,3,0],[17400,0,0],[17550,3,0],[17700,2,0],[18000,0,0],[18150,3,0],[18300,0,0],[18450,3,0],[18600,2,0],[18900,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[19500,3,150],[19800,1,450],[20400,2,1050]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[22500,1,0],[22650,3,0],[22800,0,150],[23100,1,0],[23400,3,0],[23700,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[24000,0,0],[24150,3,0],[24300,0,0],[24450,3,0],[24600,2,0],[24900,0,0],[25050,3,0],[25200,0,0],[25350,3,0],[25500,2,0],[25800,0,0],[25950,3,0],[26100,0,0],[26250,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[26400,2,0],[26700,0,0],[26850,3,0],[27000,0,0],[27150,3,0],[27300,2,0],[27600,0,0],[27750,3,0],[27900,0,0],[28050,3,0],[28200,2,0],[28500,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[29100,3,150],[29400,1,450],[30000,2,1050],[28800,6,450]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[32100,1,0],[32250,3,0],[32400,0,150],[32700,1,0],[33000,3,0],[33300,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[33600,0,0],[33750,3,0],[33900,0,0],[34050,3,0],[34200,2,0],[34500,0,0],[34650,3,0],[34800,0,0],[34950,3,0],[35100,2,0],[35400,0,0],[35550,3,0],[35700,0,0],[35850,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[36000,2,0],[36300,0,0],[36450,3,0],[36600,0,0],[36750,3,0],[36900,2,0],[37200,0,0],[37350,3,0],[37500,0,0],[37650,3,0],[37800,2,0],[38100,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[39000,0,0],[39150,1,0],[39450,3,0],[39750,3,0],[40050,2,0],[40200,3,0],[40500,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[40800,1,0],[41400,0,0],[41550,1,0],[41850,3,0],[42150,3,0],[42450,2,0],[42600,3,0],[42900,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[43800,0,0],[43950,1,0],[44250,3,0],[44550,3,0],[44850,2,0],[45000,3,0],[45300,0,0],[43200,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[45600,0,0],[45750,3,0],[46050,0,0],[46200,3,0],[46500,0,0],[46650,3,0],[46950,0,0],[47100,3,0],[47400,0,0],[47550,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[48600,0,0],[48750,1,0],[49050,3,0],[49350,3,0],[49650,2,0],[49800,3,0],[50100,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[50400,1,0],[51000,0,0],[51150,1,0],[51450,3,0],[51750,3,0],[52050,2,0],[52200,3,0],[52500,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[53400,0,0],[53550,1,0],[53850,3,0],[54150,3,0],[54450,2,0],[54600,3,0],[54900,0,0],[52800,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[55200,0,0],[55350,3,0],[55650,0,0],[55800,3,0],[56100,0,0],[56250,3,0],[56550,0,0],[56700,3,0],[57000,0,0],[57150,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[57750,0,0],[57900,1,0],[58050,0,0],[58200,2,300],[58800,3,450],[59400,2,150],[59700,0,450]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[60600,2,300],[61200,3,300],[61800,2,300]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[62400,0,0],[62550,3,0],[62850,3,0],[63000,2,0],[63300,0,0],[63450,3,0],[63600,0,0],[63750,3,0],[63900,2,0],[64200,0,0],[64350,3,0],[64500,0,0],[64650,3,0],[62700,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[64800,2,0],[65100,0,0],[65250,3,0],[65400,0,0],[65550,3,0],[65700,2,0],[66000,0,0],[66150,3,0],[66300,0,0],[66450,3,0],[66600,2,0],[66900,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[67350,0,0],[67500,1,0],[67650,0,0],[67800,2,300],[68400,3,450],[69000,2,150],[69300,0,450]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[70200,2,300],[70800,3,300],[71400,0,300]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[72000,0,0],[72150,3,0],[72450,3,0],[72600,2,0],[72900,0,0],[73050,3,0],[73200,0,0],[73350,3,0],[73500,2,0],[73800,0,0],[73950,3,0],[74100,0,0],[74250,3,0],[72300,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[74400,2,0],[74700,0,0],[74850,3,0],[75000,0,0],[75150,3,0],[75300,2,0],[75600,0,0],[75750,3,0],[75900,0,0],[76050,3,0],[76200,2,0],[76500,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[76800,0,0],[77400,2,0],[77700,0,0],[78150,1,0],[78450,3,0],[78750,1,0],[78900,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[79800,2,0],[80100,0,0],[80550,1,0],[80850,3,0],[81150,1,0],[81300,0,0],[79200,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[81600,0,0],[82200,2,0],[82500,0,0],[82950,1,0],[83250,3,0],[83550,1,0],[83700,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[84600,2,0],[84900,0,0],[85350,1,0],[85650,3,0],[85950,1,0],[86100,0,0],[84000,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[86400,0,0],[86550,1,0],[86700,3,0],[86850,1,0],[87000,0,0],[87150,1,0],[87300,3,0],[87450,2,0],[87600,0,0],[87750,1,0],[87900,3,0],[88050,1,0],[88200,0,0],[88350,1,0],[88500,3,0],[88650,2,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[88800,0,0],[88950,1,0],[89100,3,0],[89250,1,0],[89400,0,0],[89550,1,0],[89700,3,0],[89850,2,0],[90000,3,0],[90150,0,0],[90300,3,0],[90450,1,0],[90600,3,0],[90750,1,0],[90900,2,0],[91050,0,450]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[91200,0,0],[91350,1,0],[91500,3,0],[91650,1,0],[91800,0,0],[91950,1,0],[92100,3,0],[92250,2,0],[92400,0,0],[92550,1,0],[92700,3,0],[92850,1,0],[93000,0,0],[93150,1,0],[93300,3,0],[93450,2,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[93600,0,0],[93750,1,0],[93900,3,0],[94050,1,0],[94200,0,0],[94350,1,0],[94500,3,0],[94650,2,0],[94800,3,0],[94950,0,0],[95100,3,0],[95250,1,0],[95400,3,0],[95550,1,0],[95700,2,0],[95850,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[96000,0,0],[96150,1,0],[96300,3,0],[96450,1,0],[96600,0,0],[96750,1,0],[96900,3,0],[97050,2,0],[97200,0,0],[97350,1,0],[97500,3,0],[97650,1,0],[97800,0,0],[97950,1,0],[98100,3,0],[98250,2,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[98400,0,0],[98550,1,0],[98700,3,0],[98850,1,0],[99000,0,0],[99150,1,0],[99300,3,0],[99450,2,0],[99600,3,0],[99750,0,0],[99900,3,0],[100050,1,0],[100200,3,0],[100350,1,0],[100500,2,0],[100650,0,450]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[100800,0,0],[100950,1,0],[101100,3,0],[101250,1,0],[101400,0,0],[101550,1,0],[101700,3,0],[101850,2,0],[102000,0,0],[102150,1,0],[102300,3,0],[102450,1,0],[102600,0,0],[102750,1,0],[102900,3,0],[103050,2,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[103200,0,0],[103350,1,0],[103500,3,0],[103650,1,0],[103800,0,0],[103950,1,0],[104100,3,0],[104250,2,0],[104400,3,0],[104550,0,0],[104700,3,0],[104850,1,0],[105000,3,0],[105150,1,0],[105300,2,0],[105450,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[105600,3,600]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0}],"bpm":100,"sections":0,"needsVoices":true,"player1":"bf","player2":"dad","sectionLengths":[],"speed":1.5000000000000004,"validScore":true},"bpm":100,"sections":50,"notes":[{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[0,0,0],[600,2,0],[900,0,0],[1350,1,0],[1650,3,0],[1950,1,0],[2100,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[3000,2,0],[3300,0,0],[3750,1,0],[4050,3,0],[4350,1,0],[4500,0,0],[2400,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[4800,0,0],[4950,3,0],[5100,0,0],[5250,3,0],[5400,2,0],[5700,0,0],[5850,3,0],[6000,0,0],[6150,3,0],[6300,2,0],[6600,0,0],[6750,3,0],[6900,0,0],[7050,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[7200,2,0],[7500,0,0],[7650,3,0],[7800,0,0],[7950,3,0],[8100,2,0],[8400,0,0],[8550,3,0],[8700,0,0],[8850,3,0],[9000,2,0],[9300,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[9600,0,0],[10200,2,0],[10500,0,0],[10950,1,0],[11250,3,0],[11550,1,0],[11700,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[12600,2,0],[12900,0,0],[13350,1,0],[13650,3,0],[13950,1,0],[14100,0,0],[12000,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[14400,0,0],[14550,3,0],[14700,0,0],[14850,3,0],[15000,2,0],[15300,0,0],[15450,3,0],[15600,0,0],[15750,3,0],[15900,2,0],[16200,0,0],[16350,3,0],[16500,0,0],[16650,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[16800,2,0],[17100,0,0],[17250,3,0],[17400,0,0],[17550,3,0],[17700,2,0],[18000,0,0],[18150,3,0],[18300,0,0],[18450,3,0],[18600,2,0],[18900,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[19500,3,150],[19800,1,450],[20400,2,1050]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[22500,1,0],[22650,3,0],[22800,0,150],[23100,1,0],[23400,3,0],[23700,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[24000,0,0],[24150,3,0],[24300,0,0],[24450,3,0],[24600,2,0],[24900,0,0],[25050,3,0],[25200,0,0],[25350,3,0],[25500,2,0],[25800,0,0],[25950,3,0],[26100,0,0],[26250,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[26400,2,0],[26700,0,0],[26850,3,0],[27000,0,0],[27150,3,0],[27300,2,0],[27600,0,0],[27750,3,0],[27900,0,0],[28050,3,0],[28200,2,0],[28500,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[29100,3,150],[29400,1,450],[30000,2,1050],[28800,6,450]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[32100,1,0],[32250,3,0],[32400,0,150],[32700,1,0],[33000,3,0],[33300,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[33600,0,0],[33750,3,0],[33900,0,0],[34050,3,0],[34200,2,0],[34500,0,0],[34650,3,0],[34800,0,0],[34950,3,0],[35100,2,0],[35400,0,0],[35550,3,0],[35700,0,0],[35850,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[36000,2,0],[36300,0,0],[36450,3,0],[36600,0,0],[36750,3,0],[36900,2,0],[37200,0,0],[37350,3,0],[37500,0,0],[37650,3,0],[37800,2,0],[38100,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[39000,0,0],[39150,1,0],[39450,3,0],[39750,3,0],[40050,2,0],[40200,3,0],[40500,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[40800,1,0],[41400,0,0],[41550,1,0],[41850,3,0],[42150,3,0],[42450,2,0],[42600,3,0],[42900,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[43800,0,0],[43950,1,0],[44250,3,0],[44550,3,0],[44850,2,0],[45000,3,0],[45300,0,0],[43200,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[45600,0,0],[45750,3,0],[46050,0,0],[46200,3,0],[46500,0,0],[46650,3,0],[46950,0,0],[47100,3,0],[47400,0,0],[47550,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[48600,0,0],[48750,1,0],[49050,3,0],[49350,3,0],[49650,2,0],[49800,3,0],[50100,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[50400,1,0],[51000,0,0],[51150,1,0],[51450,3,0],[51750,3,0],[52050,2,0],[52200,3,0],[52500,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[53400,0,0],[53550,1,0],[53850,3,0],[54150,3,0],[54450,2,0],[54600,3,0],[54900,0,0],[52800,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[55200,0,0],[55350,3,0],[55650,0,0],[55800,3,0],[56100,0,0],[56250,3,0],[56550,0,0],[56700,3,0],[57000,0,0],[57150,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[57750,0,0],[57900,1,0],[58050,0,0],[58200,2,300],[58800,3,450],[59400,2,150],[59700,0,450]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[60600,2,300],[61200,3,300],[61800,2,300]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[62400,0,0],[62550,3,0],[62850,3,0],[63000,2,0],[63300,0,0],[63450,3,0],[63600,0,0],[63750,3,0],[63900,2,0],[64200,0,0],[64350,3,0],[64500,0,0],[64650,3,0],[62700,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[64800,2,0],[65100,0,0],[65250,3,0],[65400,0,0],[65550,3,0],[65700,2,0],[66000,0,0],[66150,3,0],[66300,0,0],[66450,3,0],[66600,2,0],[66900,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[67350,0,0],[67500,1,0],[67650,0,0],[67800,2,300],[68400,3,450],[69000,2,150],[69300,0,450]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[70200,2,300],[70800,3,300],[71400,0,300]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[72000,0,0],[72150,3,0],[72450,3,0],[72600,2,0],[72900,0,0],[73050,3,0],[73200,0,0],[73350,3,0],[73500,2,0],[73800,0,0],[73950,3,0],[74100,0,0],[74250,3,0],[72300,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[74400,2,0],[74700,0,0],[74850,3,0],[75000,0,0],[75150,3,0],[75300,2,0],[75600,0,0],[75750,3,0],[75900,0,0],[76050,3,0],[76200,2,0],[76500,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[76800,0,0],[77400,2,0],[77700,0,0],[78150,1,0],[78450,3,0],[78750,1,0],[78900,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[79800,2,0],[80100,0,0],[80550,1,0],[80850,3,0],[81150,1,0],[81300,0,0],[79200,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[81600,0,0],[82200,2,0],[82500,0,0],[82950,1,0],[83250,3,0],[83550,1,0],[83700,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[84600,2,0],[84900,0,0],[85350,1,0],[85650,3,0],[85950,1,0],[86100,0,0],[84000,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[86400,0,0],[86550,1,0],[86700,3,0],[86850,1,0],[87000,0,0],[87150,1,0],[87300,3,0],[87450,2,0],[87600,0,0],[87750,1,0],[87900,3,0],[88050,1,0],[88200,0,0],[88350,1,0],[88500,3,0],[88650,2,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[88800,0,0],[88950,1,0],[89100,3,0],[89250,1,0],[89400,0,0],[89550,1,0],[89700,3,0],[89850,2,0],[90000,3,0],[90150,0,0],[90300,3,0],[90450,1,0],[90600,3,0],[90750,1,0],[90900,2,0],[91050,0,450]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[91200,0,0],[91350,1,0],[91500,3,0],[91650,1,0],[91800,0,0],[91950,1,0],[92100,3,0],[92250,2,0],[92400,0,0],[92550,1,0],[92700,3,0],[92850,1,0],[93000,0,0],[93150,1,0],[93300,3,0],[93450,2,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[93600,0,0],[93750,1,0],[93900,3,0],[94050,1,0],[94200,0,0],[94350,1,0],[94500,3,0],[94650,2,0],[94800,3,0],[94950,0,0],[95100,3,0],[95250,1,0],[95400,3,0],[95550,1,0],[95700,2,0],[95850,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[96000,0,0],[96150,1,0],[96300,3,0],[96450,1,0],[96600,0,0],[96750,1,0],[96900,3,0],[97050,2,0],[97200,0,0],[97350,1,0],[97500,3,0],[97650,1,0],[97800,0,0],[97950,1,0],[98100,3,0],[98250,2,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[98400,0,0],[98550,1,0],[98700,3,0],[98850,1,0],[99000,0,0],[99150,1,0],[99300,3,0],[99450,2,0],[99600,3,0],[99750,0,0],[99900,3,0],[100050,1,0],[100200,3,0],[100350,1,0],[100500,2,0],[100650,0,450]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[100800,0,0],[100950,1,0],[101100,3,0],[101250,1,0],[101400,0,0],[101550,1,0],[101700,3,0],[101850,2,0],[102000,0,0],[102150,1,0],[102300,3,0],[102450,1,0],[102600,0,0],[102750,1,0],[102900,3,0],[103050,2,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[103200,0,0],[103350,1,0],[103500,3,0],[103650,1,0],[103800,0,0],[103950,1,0],[104100,3,0],[104250,2,0],[104400,3,0],[104550,0,0],[104700,3,0],[104850,1,0],[105000,3,0],[105150,1,0],[105300,2,0],[105450,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[105600,3,600]],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0}]}
\ No newline at end of file
diff --git a/assets/data/introText.txt b/assets/data/introText.txt
index c982185ba..58b092051 100644
--- a/assets/data/introText.txt
+++ b/assets/data/introText.txt
@@ -30,4 +30,6 @@ his name isnt keith--dumb eggy lol
 his name isnt evan--silly tiktok
 stream chuckie finster--on spotify
 never forget to--pray to god
-dont play rust--we only funkin
\ No newline at end of file
+dont play rust--we only funkin
+good bye--my penis
+dababy--biggest inspiration
\ No newline at end of file
diff --git a/assets/data/specialThanks.txt b/assets/data/specialThanks.txt
index b5a526dea..dad1a7326 100644
--- a/assets/data/specialThanks.txt
+++ b/assets/data/specialThanks.txt
@@ -14,5 +14,6 @@ SrPelo
 Austin East
 Krystin, Kaye-lyn, Cassidy, Mack, Levi, and Jasmine.
 Laurel
+bbpanzu
 
 BIT BOY - MIKE WELSH
\ No newline at end of file
diff --git a/assets/images/ape_FNF.png b/assets/images/ape_FNF.png
deleted file mode 100644
index 6c7e78685..000000000
Binary files a/assets/images/ape_FNF.png and /dev/null differ
diff --git a/assets/music/Eggnog_Inst.mp3 b/assets/music/Eggnog_Inst.mp3
new file mode 100644
index 000000000..d36861ecf
Binary files /dev/null and b/assets/music/Eggnog_Inst.mp3 differ
diff --git a/assets/music/Eggnog_Inst.ogg b/assets/music/Eggnog_Inst.ogg
new file mode 100644
index 000000000..bed04629b
Binary files /dev/null and b/assets/music/Eggnog_Inst.ogg differ
diff --git a/assets/music/Eggnog_Voices.mp3 b/assets/music/Eggnog_Voices.mp3
new file mode 100644
index 000000000..2ccaf536c
Binary files /dev/null and b/assets/music/Eggnog_Voices.mp3 differ
diff --git a/assets/music/Eggnog_Voices.ogg b/assets/music/Eggnog_Voices.ogg
new file mode 100644
index 000000000..6fc75784f
Binary files /dev/null and b/assets/music/Eggnog_Voices.ogg differ
diff --git a/source/Boyfriend.hx b/source/Boyfriend.hx
index a30805221..b22917935 100644
--- a/source/Boyfriend.hx
+++ b/source/Boyfriend.hx
@@ -11,9 +11,9 @@ class Boyfriend extends Character
 {
 	public var stunned:Bool = false;
 
-	public function new(x:Float, y:Float)
+	public function new(x:Float, y:Float, ?char:String = 'bf')
 	{
-		super(x, y);
+		super(x, y, char, true);
 	}
 
 	override function update(elapsed:Float)
diff --git a/source/Character.hx b/source/Character.hx
index 255fcdc3a..3b2b22875 100644
--- a/source/Character.hx
+++ b/source/Character.hx
@@ -166,8 +166,7 @@ class Character extends FlxSprite
 				addOffset("singLEFTmiss", 62, 64);
 				addOffset("singDOWNmiss", 210, -28);
 
-				if (!isPlayer)
-					flipX = true;
+				flipX = true;
 
 			case 'bf':
 				var tex = FlxAtlasFrames.fromSparrow('assets/images/BOYFRIEND.png', 'assets/images/BOYFRIEND.xml');
@@ -188,7 +187,6 @@ class Character extends FlxSprite
 				animation.addByPrefix('deathConfirm', "BF Dead confirm", 24, false);
 
 				animation.addByPrefix('scared', 'BF idle shaking', 24);
-				playAnim('idle');
 
 				antialiasing = true;
 
@@ -206,6 +204,28 @@ class Character extends FlxSprite
 				addOffset('deathLoop', 37, 5);
 				addOffset('deathConfirm', 37, 69);
 				addOffset('scared', -4);
+
+				flipX = true;
+		}
+
+		playAnim('singUP');
+
+		if (isPlayer)
+		{
+			flipX = !flipX;
+
+			// var animArray
+			var oldRight = animation.getByName('singRIGHT').frames;
+			animation.getByName('singRIGHT').frames = animation.getByName('singLEFT').frames;
+			animation.getByName('singLEFT').frames = oldRight;
+
+			// IF THEY HAVE MISS ANIMATIONS??
+			if (animation.getByName('singRIGHTmiss') != null)
+			{
+				var oldMiss = animation.getByName('singRIGHTmiss').frames;
+				animation.getByName('singRIGHTmiss').frames = animation.getByName('singLEFTmiss').frames;
+				animation.getByName('singLEFTmiss').frames = oldMiss;
+			}
 		}
 	}
 
diff --git a/source/ChartingState.hx b/source/ChartingState.hx
index 54f526ce2..04d6bab33 100644
--- a/source/ChartingState.hx
+++ b/source/ChartingState.hx
@@ -47,6 +47,8 @@ class ChartingState extends MusicBeatState
 	 */
 	var curSection:Int = 0;
 
+	public static var lastSection:Int = 0;
+
 	var bpmTxt:FlxText;
 
 	var strumLine:FlxSprite;
@@ -79,6 +81,8 @@ class ChartingState extends MusicBeatState
 
 	override function create()
 	{
+		curSection = lastSection;
+
 		gridBG = FlxGridOverlay.create(GRID_SIZE, GRID_SIZE, GRID_SIZE * 8, GRID_SIZE * 16);
 		add(gridBG);
 
@@ -167,6 +171,18 @@ class ChartingState extends MusicBeatState
 			trace('CHECKED!');
 		};
 
+		var check_mute_inst = new FlxUICheckBox(10, 200, null, null, "Mute Instrumental (in editor)", 100);
+		check_mute_inst.checked = false;
+		check_mute_inst.callback = function()
+		{
+			var vol:Float = 1;
+
+			if (check_mute_inst.checked)
+				vol = 0;
+
+			FlxG.sound.music.volume = vol;
+		};
+
 		var saveButton:FlxButton = new FlxButton(110, 8, "Save", function()
 		{
 			saveLevel();
@@ -217,6 +233,7 @@ class ChartingState extends MusicBeatState
 		tab_group_song.add(UI_songTitle);
 
 		tab_group_song.add(check_voices);
+		tab_group_song.add(check_mute_inst);
 		tab_group_song.add(saveButton);
 		tab_group_song.add(reloadSong);
 		tab_group_song.add(reloadSongJson);
@@ -489,12 +506,23 @@ class ChartingState extends MusicBeatState
 
 		if (FlxG.keys.justPressed.ENTER)
 		{
+			lastSection = curSection;
+
 			PlayState.SONG = _song;
 			FlxG.sound.music.stop();
 			vocals.stop();
 			FlxG.switchState(new PlayState());
 		}
 
+		if (FlxG.keys.justPressed.E)
+		{
+			changeNoteSustain(Conductor.stepCrochet);
+		}
+		if (FlxG.keys.justPressed.Q)
+		{
+			changeNoteSustain(-Conductor.stepCrochet);
+		}
+
 		if (FlxG.keys.justPressed.TAB)
 		{
 			if (FlxG.keys.pressed.SHIFT)
@@ -607,6 +635,18 @@ class ChartingState extends MusicBeatState
 		super.update(elapsed);
 	}
 
+	function changeNoteSustain(value:Float):Void
+	{
+		if (curSelectedNote[2] != null)
+		{
+			curSelectedNote[2] += value;
+			curSelectedNote[2] = Math.max(curSelectedNote[2], 0);
+		}
+
+		updateNoteUI();
+		updateGrid();
+	}
+
 	function recalculateSteps():Int
 	{
 		var steps:Int = 0;
@@ -675,15 +715,7 @@ class ChartingState extends MusicBeatState
 					daNum++;
 				}
 
-				if (FlxG.keys.pressed.CONTROL)
-				{
-					FlxG.sound.music.time = (daLength - lengthBpmBullshit()) * Conductor.stepCrochet;
-				}
-				else
-				{
-					FlxG.sound.music.time += (lengthBpmBullshit() * Conductor.stepCrochet) * sec;
-				}
-
+				FlxG.sound.music.time = (daLength - lengthBpmBullshit()) * Conductor.stepCrochet;
 				vocals.time = FlxG.sound.music.time;
 				updateCurStep();
 			}
diff --git a/source/PlayState.hx b/source/PlayState.hx
index bef9e30db..adf543204 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -312,7 +312,7 @@ class PlayState extends MusicBeatState
 				dad.y += 300;
 		}
 
-		boyfriend = new Boyfriend(770, 450);
+		boyfriend = new Boyfriend(770, 450, SONG.player1);
 		add(boyfriend);
 
 		// REPOSITIONING PER STAGE
@@ -796,8 +796,8 @@ class PlayState extends MusicBeatState
 			iconP1.animation.curAnim.curFrame = 1;
 		else
 			iconP1.animation.curAnim.curFrame = 0;
-			
-        if (healthBar.percent > 80)
+
+		if (healthBar.percent > 80)
 			iconP2.animation.curAnim.curFrame = Std.parseInt(curStage) + 1;
 		else
 			iconP2.animation.curAnim.curFrame = Std.parseInt(curStage);