Added client controller, work in progress