All done except for the extra exercises