Added TODO note for self