Add my infVengeance rework to support Resolve tracking