Changed Rectangle to Shape

This will allow generalization of shape objects to include ellipses and
any other shape that might be needed.