Macro conditionals nearly working, I think