New field mapping WIP.