Getting ready for tokenisation

Last updated