Yeah, I am happy that my plan is working out. The test for FormHelper is now sub 10k lines which is nice.