WIP: need to fix broken tests, and to finish implementing the Field model in the API