I think i have the mt-patch working, needs a little more testing before PR.