Bit of work on some stuff, super generic as always