CRUD ready, moving to matching