trying to make this work as a vendor library...