Completed Assignment 2.  Minor changes to A1