May need a null check here.  I can add this in...