Initial work breaking out the multi signature
Merge from master
Fixing a merge issue
Finishing the multi definition signature parsing