Updated more work on the cursor portion