Move movement into logic thread