started reworking model files