Use 'fieldslib' for key/value pair interface

[djs55]

I think fieldslib will generate much of this code for us.