More progress on tokenizing