* voices use a unified list
* Move that back
* unneeded file
* use subsystem
* old order
* matching
* matching again
* whitespace
* another whitespace line
* global that's never used
* more cleanup
* little better naming
* lets just use the vars
* oops needed that
* incorrect comment
---------
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>