cleaned up todo merge.  now 0.9.0 updates to the todo should happen on this branch.