Refactored grid-form control flow.

Preparing for sub-collection data persistence.