#10 -  Helper Form refactoring in progress