Sam jake/controller

Controller update 
@tsamb code review prz ??