Still fixing the movedata