Finished refactor.  Need to continue on shard allocation