New TODOs and info about grunt branch