Annotate will feature a multi-shape tool. The inspiration comes from the iWork apps and Napkin for Mac.
