Ugh, why don't I look at this before I commit.