Nearly fixed the tilemap / body issue. More tests needed but then can push to master.