Minor bugfix.  Added todo list