Updated controller in prep for future "guide" mode