Start working on text masking and small changes to token search to make it compile