Start moving everything to the new API

@public will be crushed