Added todos for a bit. Nothing spectacular in this commit.