added movable tokens etc.
Mergin?