Moved some things for speed, added swiping