Merge pull request #186 from nealcpeters/todo

add todo
add more to todo