added some todo comments.