Sorting some stuff, almost got races fulling working