Moving form functionality to it's own form-helper