WIP commit for Equipment and VendorTask