Pulled out the remaining points logic from the vector manager.