Working on sorting fields, but PL says he did it too... pulling
Just cleaned up the code that we hacked up today. A bit.