Feature/add movement