worldmodel updates
Merge resolution and worldmodel part1