Added TODO and question for @joliebig