Yes! Moved to generator implementation for working through the shards!