Sorry about my 2 recently closed PRs. I was struggling to find the right balance of changes. Ive decided to split it into several PRs even if the result is a bit funny in between PRs