Additional work on shapes
Added Errors for custom Error creation