Added and finished the extra credit