Field definitions

Note TODO items