Swipe finale

Merging SWIPE into master