You might want to simply put your figures/questions in mapped rich text content controls. This does not do the gathering.

Mapped Content Controls by Greg Maxey