Implementing better wall collision
Merge