broke the controller when I merged. Fixed now but please take a look