added new model system and amended templates etc accordingly