Should this also be scoped to the currentForm?