Trying to put everything back together and adding new macros for multi and enum elements
PartyIdentification done, probably