@andrewtj That’s the plan, but I would like to see it become more streamlined.