New TODO, some lint.