moving movementMode from enum domain to systemService
working on updating driver to be more efficient in calculations