Ok I’m going to schedule this work in about 4hrs. If there are some recent helpful commits I’ll “sneak” those in too