More work towards enabling song-level automation...