Adding the zoo + tests