Began testing more models
Fixed merge errors