First draft of controller completed