Working on adding controller templates