Add innerclass exercise 16 and 17