sort working. Search is almost there
fixed merge issues