Working Version - Search still kind of slow

Everything works, but the search function is kind of slow. Need to
update this.