Finished updating the basic Template model;