(Hopefully) Fix parameter error
Added logic handling
Fix
Macro shennanegans
More Macro Madness
Stuff
Delete static marker logic
m