Movement + walls
Merged
hmm