reworking the forms plugin