Weekend work (yes I know it’s a big lazy commit.)