KAZOO-2825 WIP