This is once again mostly just a courtesy commit for my refactoring,
however, it's a bit of a nightmare with my laptop being pretty much dead
now, but I'll see what I can do.