WIP: rework cursors