Added some more TODO comments