started refactoring for using the forms-driven data