WIP: Feature/om cursors