add TODO and LogCollector code