Refactor

start with a getCursor ?