Added more TODO items

Added more TODO items