Added Shapes and Pets. And related tests, which all need to passed.