Basic movement done
Conflict