Lots of work on swiping and improving how it works