Almost finish new form

Adding new helper is not finish yet, but the rest of them are ready to
be beautified