Tristan added initial models and modified a few templates based on updates to models