Added a basic search class and manipulated indexes more.