Refactor Vendor to Basic Liquid

Will probably need editing we will see