So, It's waaay late, and I feel horrible for that, but finally gor around to finishing this for @Heppy#8008
