Yeah, I would prefer to not do it in this pr but we can later.