Added movement, still testing