Data structure changes. finish half of form builder