Remaining collisions against map done... but a little ropey.