In the process of adding controllers