Added basic persistence and tokenization
Converted tokens to sets