Merge of rebuilt Swimmer, new: NextOfKin and Trainer and they all now extend (also new) Person.