wip making send / save be successful
further updates to support the new api