Start moving everything to the new API

However should be the start of a new sentence.