Progress made on determining token kind