Proposed Handler branch from Colin.