Add Storage costs, make this a little more flexible