WIP updating to new shard 3.1
Need to create listeners for all REST methods.