sound stuff hopefully i can pull
sound stuff version zero
merge conflict resolved!