Maybe final commit

Feature-complete for final in-class presentation
Maybe final commit