New cursor

Still needs some adjustment I think