changes from .gitignore didn't go up last time? committing before merging with dawson to develope