Worked on all aspects except the searchers related classes.