more work on vendor form
committing conflict fix

blended better format with cleanup of state