Finished all extra credit for Assignment 2 (and a bit more)