Convert field basis

Incorporated changes from branch danCFB.