diff --git a/Project.xml b/Project.xml
index 3eb3740..a4437fa 100644
--- a/Project.xml
+++ b/Project.xml
@@ -92,5 +92,5 @@
 
 	<!--Place custom nodes like icons here (higher priority to override the HaxeFlixel icon)-->
 	<icon path="art/icon.png"/>
-	<haxedef name="SKIP_TO_PLAYSTATE" if="debug" />
+	<!-- <haxedef name="SKIP_TO_PLAYSTATE" if="debug" /> -->
 </project>
diff --git a/assets/music/Smash.mp3 b/assets/music/Smash.mp3
deleted file mode 100644
index 08524d8..0000000
Binary files a/assets/music/Smash.mp3 and /dev/null differ
diff --git a/assets/music/Smash_Inst.mp3 b/assets/music/Smash_Inst.mp3
deleted file mode 100644
index 0b0eff2..0000000
Binary files a/assets/music/Smash_Inst.mp3 and /dev/null differ
diff --git a/assets/music/Smash_Voices.mp3 b/assets/music/Smash_Voices.mp3
deleted file mode 100644
index e0b6ecc..0000000
Binary files a/assets/music/Smash_Voices.mp3 and /dev/null differ
diff --git a/source/ChartingState.hx b/source/ChartingState.hx
index c0ce793..a4cf96c 100644
--- a/source/ChartingState.hx
+++ b/source/ChartingState.hx
@@ -84,9 +84,9 @@ class ChartingState extends MusicBeatState
 		else
 		{
 			_song = {
-				song: 'Spookeez',
+				song: 'Monster',
 				notes: [],
-				bpm: 100,
+				bpm: 95,
 				sections: 0,
 				needsVoices: false,
 				player1: 'bf',
@@ -318,6 +318,7 @@ class ChartingState extends MusicBeatState
 					_song.notes[curSection].mustHitSection = check.checked;
 				case 'Change BPM':
 					_song.notes[curSection].changeBPM = check.checked;
+					FlxG.log.add('changed bpm shit');
 			}
 		}
 		else if (id == FlxUINumericStepper.CHANGE_EVENT && (sender is FlxUINumericStepper))
@@ -491,6 +492,8 @@ class ChartingState extends MusicBeatState
 		{
 			curSection = sec;
 
+			updateGrid();
+
 			if (updateMusic)
 			{
 				FlxG.sound.music.pause();
diff --git a/source/PlayState.hx b/source/PlayState.hx
index 9b0cffc..aedb6a2 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -87,6 +87,8 @@ class PlayState extends MusicBeatState
 		if (SONG == null)
 			SONG = Song.loadFromJson(curLevel);
 
+		Conductor.changeBPM(SONG.bpm);
+
 		var bg:FlxSprite = new FlxSprite(-600, -200).loadGraphic(AssetPaths.stageback__png);
 		// bg.setGraphicSize(Std.int(bg.width * 2.5));
 		// bg.updateHitbox();
@@ -693,13 +695,13 @@ class PlayState extends MusicBeatState
 					switch (Math.abs(daNote.noteData))
 					{
 						case 2:
-							dad.playAnim('singUP');
+							dad.playAnim('singUP', true);
 						case 3:
-							dad.playAnim('singRIGHT');
+							dad.playAnim('singRIGHT', true);
 						case 1:
-							dad.playAnim('singDOWN');
+							dad.playAnim('singDOWN', true);
 						case 0:
-							dad.playAnim('singLEFT');
+							dad.playAnim('singLEFT', true);
 					}
 
 					if (SONG.needsVoices)
@@ -1150,20 +1152,24 @@ class PlayState extends MusicBeatState
 		if (generatedMusic)
 		{
 			notes.sort(FlxSort.byY, FlxSort.DESCENDING);
-
-			if (SONG.notes[curSection].changeBPM != null)
-			{
-				if (SONG.notes[curSection].changeBPM)
-				{
-					Conductor.changeBPM(SONG.notes[curSection].bpm);
-				}
-			}
 		}
 
+		FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM);
+		if (SONG.notes[Std.int(curStep / 16)].changeBPM)
+		{
+			Conductor.changeBPM(SONG.notes[Std.int(curStep / 16)].bpm);
+			FlxG.log.add('CHANGED BPM!');
+		}
+		else
+			Conductor.changeBPM(SONG.bpm);
+
 		if (camZooming && FlxG.camera.zoom < 1.35 && totalBeats % 4 == 0)
 			FlxG.camera.zoom += 0.025;
 
-		dad.dance();
+		// Dad doesnt interupt his own notes
+		if (SONG.notes[Std.int(curStep / 16)].mustHitSection)
+			dad.dance();
+
 		healthHeads.setGraphicSize(Std.int(healthHeads.width + 20));
 
 		if (totalBeats % gfSpeed == 0)
diff --git a/source/TitleState.hx b/source/TitleState.hx
index cf25c47..107d882 100644
--- a/source/TitleState.hx
+++ b/source/TitleState.hx
@@ -41,7 +41,7 @@ class TitleState extends MusicBeatState
 		super.create();
 
 		#if SKIP_TO_PLAYSTATE
-		FlxG.switchState(new FreeplayState());
+		FlxG.switchState(new ChartingState());
 		#else
 		startIntro();
 		#end