refactor .vendor(). Closes #1