Beginning of audio-reactive stuff
Fixed merge conflicts