emprice-testing

I think this is ready to merge in now; I can resolve the conflicts manually.