todo and testing update