First pass on Search separation done