Changes to the architecture
Initial tokenization process