I really need to double check things *before* I commit.