Great. Glad you got it working. Think it looks pretty good now, well structured and should be easier to look after or debug issues.
Let me know if you need anything else.
BTW, for some reason, I don’t get alerts from this thread, so PM me for anything.