Fixed collisions
Working on battle selection