Switch Shape to Base class (fixes #9)