WIP for pandora + control