Proof of concept work.
Full tests for changes. Fieldsfiles to go.