add todo and change structure