Feature/iss82

Movements completed