New pie model, and tests.