Set correct draw x and y so the shapes move with correct displacement. Added an invalidate canvas variable to ensure canvas isn't redrawn too often. Started working on checking shape moving, right now set to true always.