refactoring. add TODO tasks