merged TODO from 0.0.x