WIP switch category: seems good but need to update tempo in wrapper