updated everything with todo messages