Add collision detection in y axis (still messy)