Added more to settings and models; starting templates