Revert "Some VERY simple movement algorithm"

This reverts commit bdc785e6186753b141203172d7fad5d638f7d9f4.