CRUD hacks - draft version