CW: Added swipe end function
CW: Further changes to make app generic and not WC related