Save off changes before experimenting
Semi-functional vendor list, general cleanup