Added ability to mark todo as 'in progress', or 'wait'