Audio Class updates

Moved methods into audio class.