Big update, vendor system is now complete