Got rid of ranges.  Seems to be much faster now.