Added sounds. Refactoring in progress
Refactor WIP
Attempt to merge
Refactor part 1 done.