Assessments

I know this branch isn't ready to be merged, but opening a pull request helps me go through and evaluate all the changes.
could factor into a before