Audio complete

To do:
Extra features in discussion