Any ideas on how to fix the TODO, or is not really applicable?