Moved cell movement code into world