More work on crud