Implemented contains method for all shapes
Added selection control classes