started integrating the shape class