This is the format we had used for all other controllers and such. Do we want to change it?