First commit of shard capable code base