Filled in some more TODO areas