WIP: Update to Shard v3

*Do not merge*

This is a work in progress PR so we can discuss.