Add ctors and add search. Should actually work