Controller layer - 1st commit