Refactored into single motion class.... yaygsgs