Move bulk discount handling, make it automatic