More work on swiping