Playing w/ session, this breaks CI now but it's OK