Integrated database masking into some of the shimmy methods...