Am I on the right track with this patch, or are there problems I haven't
thought of?

Thank you for your time.