Replace shape with geometry (rebased)

please keep the old methods around with a 'deprecated' error.  also for properties that have been removed.