reworked field definitions a bit to be more in line with Robs Proposal