Added sounds to everything!
Merge conflicts