Guys look at me, I'm actually staying organized! Was it really that hard?

If you PR anything, please only one model per commit, and use the name_followed_by_id_123456789 pattern for commit messages.