Added the first bit of fields containers logic.