added controllers

Merge please