Migrating over tokenlist to Yaml
Adding unit test for last commit
Fixing that last unit test
Forgot to comment out a line :)