TODO: commit question