Work in progress on swipe
Merge branch 'sy'