6 more TODO's passing