Added more logic to makeOccupied, created a undead bug