Finished 1. and 2. extra credit for Assignment 3