Initial changes for Assignment 2 requirements.