Rewrote the Field Builder, but needs to be tested for backwards compatability.