Updated todo, screenie [skip ci]