Adds the latests updates, including the consumer

The merge error is just the readme...