update to Movement and Unit classes