Changed the Field to a decorator, which is much less fraught with problems.