start implementing new api