Start moving everything to the new API
4 files changed