A few more TODO questions