Finished more TODO