Added Shape and Cube classes