Add some tokenizing