New quadrature

Let's get this in!  I'd like to get this in and start working on residual controls...