Adding in a cursor pointer. Closes #12