Here is the solution. Check inside for changes and comments on them.
Not a real project but will be unshared once @squirrel-monkey_alt fixes it.
