Tried to fix pinch move problem, needs testing
Made some changes to start making the demo