Finish exercise 7; extra credit is in ex7-extra.sql