WIP revamping of audio support.