Add Will Ship/Should Ship logic