Completed Extra Credit #1 & #2