Added Goose and Platypus, improved class hierarchy