Added logic to merge the log files into a single file when done.  Updated the todo list.