DO NOT MERGE: integrate audio in player