Finished exercises 1.7 and 1.8