Address a large chunk of this FIXME by accumulating the cost for