added a few todo lines.