(review)

This PR creates a unified diff for easier peer review. It is in a throwaway branch, and will likely be discarded once changes are made.