WIP adapting to lists api