Add token. First attempt at replacing calendar views
Fixing lots of tests