Feature/batched values

This will make it impossible to store the 0 value.