more work on supporting the state of Figures inside of a ParentFigure
reverted back to semi-working behaviour