Beefing up tasks edit/delete - incomplete