Renamed Model
Seems to be basically working