Tokenized sent calc tools built
Mixed merge conflict