moved code to shape class
Added shape object