Use vectors for relative motion (#642)