@Rakksor nice work. I will try to test and merge this weekend if I get time.
We should probably squash the (now) unrelated commits so we just get the changes in 33a8cc9. @Rakksor if you want to do it ahead of time, it will make merging it a little easier.