Added cursor support
forgot I already had the class so I moved it