Currently trying to find a bottleneck that I thought existed here before merge/push.