working on swipe support