moving this towards a combined api