Basics for new design
Add basic search feature (dirty and slooow)