updates for new API, add some TODOs