More work towards aligning this to how PyDAW works internally...