Please find attached a sample file. There are a couple of parameters wired together but it should be pretty clear what's what from the files. You're right about the 3 Macros, there should be two - one for the X Axis, and one for the Y. It seems the name of the macro is too long to display so they look the same - I'll fix that and remove the extra one.
Thanks for the feedback!