Added todo
0.6.5