*almost* have the race filtering working...