Sushi/porting to new api

First PR.