Stuff works a bit (play/pause)
Fixed merge