Feature/batched values

I don't understand the point of this else clause.