Finished all extra credit portions