It's working again!
Added a macro to help define inputs/outputs