further api changes. Should have everything needed for now