Added large ToDo comments for remaining loose ends.