KAZOO-80: WIP