Really should have added this to version control earlier, but was trying to fix all the pre-commit issues first...