finshed testing on a larger dataset and made another pretty neat speedup.