Start moving everything to the new API