Minor clean up
Rewrote matching engine to reduce the number of combinations (fields are broken)
Re-add field support