Think I'm on the right path for fixing g the forms but not quite there