1st pass at task tracker + accumulator merge changes