Final commit (hopefully) after double checking the rubrics.