Finish up the audio modularity POC