Attach Notes To Shape

It's great to be able to add notes to the canvas. I often add notes that are related to one of the shapes, if I add new shapes in though and click auto-layout then this causes my notes to be misaligned. It would be very useful if notes could be attached to a shape.

I would prefer them to still be visible in the canvas (rather than adding a note in the shape settings) so my preference would be something like you attach a note with a line and then auto layout always keeps notes to the left of the shape it is attached to.