use new version of the macros - and add wip changes for newaddtask and remtask