defpatch now partially works.