Rewritten some music stuff on stream :3