Started adding cursor class