merged pacer into voice
more merge shenanigans