Delegate function rewrite - add/edit/delete fully functional

Delegate function rewrite - add/edit/delete fully functional