Add ToDo and commandline parameter.

refs #270, #131