This branch hasn't got anything to do with the forms.
I am working on a separate branch for this. Sorry these sneaked there ugly head in here.