Plenty of bugs now, I've started ripping out the grid-confinement on the entities.