transition most everything over to new flow