Swipe shit
Revert "Swipe shit"

This reverts commit 2ef3e077d95a93f3b1a36a7232ceb63e910857cf.
Merge remote-tracking branch 'origin/master'