OK SO. Code has been updated to the latest version, patch is sent to ubq323, and here is the patch for anyone who wants to test it out: https://paste.sr.ht/~arcade/f854d9d84b0ac4d4b9c90b75643f556982d2e21c