Adding some todo comments.