major overhaul, added support for vendors