Added commenting and a new TODO