swipe working, needs refactoring