Made tap collect and swipe discard
Moved game loop to envelope class; removed TODOs