Move token object into Instruction object
Start using controller
Merge branch 'master' of github.com:parmaja/sard