Merge "First draft of the controller"