Working on making search more memory-efficient