add cursor, urgent need for refactor