Another macro commit as I test these new changes. I need to push each
time to test the remote install..
fix for the source bug