Shard Module 2.0

This brings shard module up to date using the latest shard 3.0