reviewed all todo's and marked against the name