Tag Aware Sharding

WIP. Don't merge yet.