Done with design. Fixing search and CRUD.