Yes that’s correct.
And disregard my last response, I did correct issue with movement along the Z axis.
Now I have expected movement, it’s just going wrong way. But that’s simple to solve. I will confirm then mark your answer correct once I make sure everything is in order. It looks like the only change to your code that was needed was to split the struct and only use the X and Y locations (in my case only).