Number of T's correct yet? Added TODO