Tons of new changes to make things work again, getting there