Can you resolve the TODO?