Finish exercise 5,6.  Need to fix rubocop errors