Added a collision test, todo: check before moving