make forms generic as well