Add collision detection on Y axis
Add more collision detection