WIP: Feature/om cursors

why do this differently?