A little more CRUD