Added a conundrum controller