Initial commit of custom sharding functionality.
Fixing failing tests.