Disregard my performance comments earlier on this PR, you have clearly done a ton of homework :)