about to restructure for form base