Sooooooo close... fixed some ordering issues, now down to (ostensibly) needing a decent upsampler