Fix #22 - Implemented motion