Simplified; removed swipe ability for now