Added more to the cursor. Need to fix a few more bugs