Should we move this content up into the else statement so we only need a single if check?