Integrate justin's swipe part 1