Setting cursor was throwing exeption, commented at the moment, will investigate later. Some work on fixing clay.