Ported and dramatically cleaned up the quadrature system. This includes centralizing all field definitions
