Replace shape with geometry (rebased)

Done.