Krush/new pricing

I dig these comments, would like integrate more of this into our current code