WIP: Feature/om cursors

what happened to the spacing here?