@heydon speaking of the pr, I might have some new changes tomorrow, can the merge wait until this weekend? Or I can open a new one later on, it’s no trouble :)