Commit 1.16

Introducing token movement and behaviour.