@Raydiation just rebased over the current master. It's still the same