Just replying here to let you know I'm tackling this in the main thread, not sure if you'll get notifications for that
