First cut of changes to new api