Final commit from programming 1 (post-class).