Added swipe events
Merge cornflicts