Fixes to add CRUDs

Final format before presentation