Completed X8.4,5,7; Updated TODO.