Audio integration

Intermediate audio changes