Some work on the vendor class. It doesn't compile yet.