Start work on the new final api