Move todo management to Builder.
Merge pull request #4 from drocco007/feature/contingent-move-todo

Move todo management to Builder.