Refactoring to form builder .. preparing for injection