diff --git a/assets/music/GAME_OVER_Dont_Stop.mp3 b/assets/music/GAME_OVER_Dont_Stop.mp3
new file mode 100644
index 000000000..e8f76e09d
Binary files /dev/null and b/assets/music/GAME_OVER_Dont_Stop.mp3 differ
diff --git a/assets/music/GAME_OVER_Dont_Stop_END_PART.mp3 b/assets/music/GAME_OVER_Dont_Stop_END_PART.mp3
new file mode 100644
index 000000000..684181bed
Binary files /dev/null and b/assets/music/GAME_OVER_Dont_Stop_END_PART.mp3 differ
diff --git a/assets/music/freakyMenu.mp3 b/assets/music/freakyMenu.mp3
new file mode 100644
index 000000000..caaf7c560
Binary files /dev/null and b/assets/music/freakyMenu.mp3 differ
diff --git a/source/ChartingState.hx b/source/ChartingState.hx
index 3fe3bc38d..92cc345cc 100644
--- a/source/ChartingState.hx
+++ b/source/ChartingState.hx
@@ -488,9 +488,9 @@ class ChartingState extends MusicBeatState
 
 		for (note in _song.notes[daSec - sectionNum].sectionNotes)
 		{
-			var strum = note.strumTime + Conductor.stepCrochet * (_song.notes[daSec].lengthInSteps * sectionNum);
+			var strum = note[0] + Conductor.stepCrochet * (_song.notes[daSec].lengthInSteps * sectionNum);
 
-			var copiedNote:NoteMeta = new NoteMeta(strum, note.noteData, note.sustainLength);
+			var copiedNote:Array<Dynamic> = [strum, note[1], note[2]];
 			_song.notes[daSec].sectionNotes.push(copiedNote);
 		}
 
diff --git a/source/Main.hx b/source/Main.hx
index d4bd9a4a7..13376db44 100644
--- a/source/Main.hx
+++ b/source/Main.hx
@@ -9,7 +9,7 @@ class Main extends Sprite
 	public function new()
 	{
 		super();
-		addChild(new FlxGame(0, 0, ChartingState));
+		addChild(new FlxGame(0, 0, TitleState));
 
 		#if !mobile
 		addChild(new FPS(10, 3, 0xFFFFFF));
diff --git a/source/MusicBeatState.hx b/source/MusicBeatState.hx
index 5b41c228c..6b36864de 100644
--- a/source/MusicBeatState.hx
+++ b/source/MusicBeatState.hx
@@ -25,7 +25,7 @@ class MusicBeatState extends FlxUIState
 		everyStep();
 
 		updateCurStep();
-		curBeat = Math.floor(curStep / 4);
+		curBeat = Math.round(curStep / 4);
 
 		super.update(elapsed);
 	}
diff --git a/source/TitleState.hx b/source/TitleState.hx
index 7be9ca07f..057aff8f9 100644
--- a/source/TitleState.hx
+++ b/source/TitleState.hx
@@ -8,19 +8,25 @@ import flixel.addons.transition.FlxTransitionSprite.GraphicTransTileDiamond;
 import flixel.addons.transition.FlxTransitionableState;
 import flixel.addons.transition.TransitionData;
 import flixel.graphics.FlxGraphic;
+import flixel.group.FlxGroup;
 import flixel.input.gamepad.FlxGamepad;
 import flixel.math.FlxPoint;
 import flixel.math.FlxRect;
+import flixel.text.FlxText;
 import flixel.tweens.FlxEase;
 import flixel.tweens.FlxTween;
 import flixel.util.FlxColor;
 import flixel.util.FlxTimer;
 
-class TitleState extends FlxTransitionableState
+class TitleState extends MusicBeatState
 {
 	static var initialized:Bool = false;
 	static public var soundExt:String = ".mp3";
 
+	var blackScreen:FlxSprite;
+	var credGroup:FlxGroup;
+	var credTextShit:FlxText;
+
 	override public function create():Void
 	{
 		#if (!web)
@@ -70,7 +76,23 @@ class TitleState extends FlxTransitionableState
 		FlxTween.tween(logoBl, {y: logoBl.y + 50}, 0.6, {ease: FlxEase.quadInOut, type: PINGPONG});
 		FlxTween.tween(logo, {y: logoBl.y + 50}, 0.6, {ease: FlxEase.quadInOut, type: PINGPONG, startDelay: 0.1});
 
-		FlxG.sound.playMusic('assets/music/title' + TitleState.soundExt, 0, false);
+		credGroup = new FlxGroup();
+		add(credGroup);
+
+		blackScreen = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK);
+		credGroup.add(blackScreen);
+
+		credTextShit = new FlxText(0, 0, 0, "ninjamuffin99\nPhantomArcade\nEvilsk8er\nAnd Kawaisprite", 24);
+		credTextShit.screenCenter();
+		credTextShit.alignment = CENTER;
+
+		credTextShit.visible = false;
+
+		FlxTween.tween(credTextShit, {y: credTextShit.y + 20}, 2.9, {ease: FlxEase.quadInOut, type: PINGPONG});
+
+		credGroup.add(credTextShit);
+
+		FlxG.sound.playMusic('assets/music/freakyMenu' + TitleState.soundExt, 0, false);
 
 		FlxG.sound.music.fadeIn(4, 0, 0.7);
 	}
@@ -79,6 +101,8 @@ class TitleState extends FlxTransitionableState
 
 	override function update(elapsed:Float)
 	{
+		Conductor.songPosition = FlxG.sound.music.time;
+
 		var pressedEnter:Bool = FlxG.keys.justPressed.ENTER;
 
 		var gamepad:FlxGamepad = FlxG.gamepads.lastActive;
@@ -105,4 +129,49 @@ class TitleState extends FlxTransitionableState
 
 		super.update(elapsed);
 	}
+
+	override function beatHit()
+	{
+		super.beatHit();
+
+		FlxG.log.add(curBeat);
+
+		switch (curBeat)
+		{
+			case 1:
+				credTextShit.visible = true;
+			case 3:
+				credTextShit.text += '\npresent...';
+			case 4:
+				credTextShit.visible = false;
+				credTextShit.text = 'In association \nwith';
+				credTextShit.screenCenter();
+			case 5:
+				credTextShit.visible = true;
+			case 7:
+				credTextShit.text += '\nNewgrounds';
+			case 8:
+				credTextShit.visible = false;
+				credTextShit.text = 'Shoutouts Tom Fulp';
+				credTextShit.screenCenter();
+			case 9:
+				credTextShit.visible = true;
+			case 11:
+				credTextShit.text += '\nlmao';
+			case 12:
+				credTextShit.visible = false;
+				credTextShit.text = "Friday";
+				credTextShit.screenCenter();
+			case 13:
+				credTextShit.visible = true;
+			case 14:
+				credTextShit.text += '\nNight';
+			case 15:
+				credTextShit.text += '\nFunkin';
+
+			case 16:
+				FlxG.camera.flash(FlxColor.WHITE, 4);
+				remove(credGroup);
+		}
+	}
 }