Almost done with the generic entity controller