Added TODO ideas