IDI-104: Progress restructuring forms; not complete yet.