conceptually still a bit open, leaving the hack in for now passing values to the macro instead of sol instances