R4: Start rewriting audio support