Adding task completion to client-side