working on adding movement to tokens
fixed movement of tokens
merging with gord's changes