added a todo and .....