Modified to use constructors - Exercise 7.0