More CRUD stuff and debugging