Add audio playback within the app
Fixing rebase errors