Did some basic search
added som sorting