BROKEN COMMIT: part way through moving to the new delegate class