I'm using Matrix Gunsmithing in Lake George, CO. They've taken over all the work from AHR for CZ upgrades and refinishing, and do a lot of work on Mauser style actions. Still very early stages of my project but Tim there has been very helpful so far and a pleasure to work with.