Initial commit for Assignment 7; re-using my Assignment 6 code.