Waiting for reviews on the bugfix! (aka bothering people on their signal to go test lol) As for the refactoring... it's going well but I'm now at "think this through once more" stage. Have to take a break soon to not go in circles, so I'm gonna go to the beach and have me a cocktail.