add logs and TODOs