Added TODO + explanation