Model user

Lesson learned: I should be commiting much more often, checking out new branches that match what I'm doing, etc. Sorry there is so much on this PR. I'm happy to walk through it with someone tomorrow.