If this scenario plays as you have outlined then you shuld include 1% of cs + 2% of warrant that is an additional .0008 then you are a genius tks