More performance *yay* - I am finished with this PR. Happy testing :)