Finalize adding the Form component back into v3 refactor