Ignore some more files
Basic updates model
Fixed merge conflict