Full metrics, nulls, simulations

Bringing all metrics nulls and simulations back in