first formal test of P2 added to tests
big ole refactor, new class: P2Estimator
dedent _nxt a bit