Issue #21 Starting working on the controllers